Cleaning some things up

home/.vimrc

@@ -8,7 +8,7 @@ execute pathogen#infect()
 
 " General Settings {{
   scriptencoding utf-8
-  set foldmethod=manual
+  set foldmethod=syntax
   set ai
 
   " Disable Ex Mode
@@ -160,19 +160,7 @@ execute pathogen#infect()
 " }}
 
 " Go {{
-  " Convenient mappings for all Go things
-  au FileType go nmap <leader>r :GoRun!<CR>
-  au FileType go nmap <leader>e <Plug>(go-rename)
-  au FileType go nmap <leader>s <Plug>(go-implements)
-  au FileType go nmap <leader>t :GoTest!<CR>
-  au FileType go nmap <leader>c <Plug>(go-coverage)
-  au FileType go nmap <leader>v <Plug>(go-vet)
-  au FileType go nmap <leader>gd <Plug>(go-doc)
-  au FileType go nmap <leader>d :GoDef<CR>
-  au FileType go nmap <leader>D :GoDescribe<CR>
 
-  " Use `goimports` instead of `gofmt`
-  let g:go_fmt_command = "goimports"
 " }}
 
 " Java {{
@@ -189,9 +177,13 @@ execute pathogen#infect()
 
 " Misc Things {{
   " Vimwiki {{
-    let g:vimwiki_list = [
-      \{'path': '~/Dropbox/Documents/vimwiki', 'path_html': '~/Dropbox/Documents/vimwiki_html/', 'auto_export':'1'},
-    \]
+    let g:vimwiki_list = [{
+      \'path': '~/Dropbox/Documents/vimwiki',
+      \'path_html': '~/Dropbox/Documents/vimwiki_html/',
+      \'template_path': '~/Dropbox/Documents/vimwiki/templates',
+      \'template_default': 'default',
+      \'template_ext': '.html',
+      \'auto_export':'1'}]
     nnoremap <leader>wb :Vimwiki2HTMLBrowse<CR><CR>
     let g:vimwiki_auto_checkbox = 1
     function! VimwikiLinkHandler(link)
@@ -212,6 +204,7 @@ execute pathogen#infect()
     endfunction
     nmap <leader><Left> <Plug>VimwikiDiaryPrevDay
     nmap <leader><Right> <Plug>VimwikiDiaryNextDay
+    let g:vimwiki_folding='expr'
   " }}
 
   " Gist {{