diff --git a/vim/bundle/unite.vim b/vim/bundle/unite.vim
index 603985a..1c1962c 160000
--- a/vim/bundle/unite.vim
+++ b/vim/bundle/unite.vim
@@ -1 +1 @@
-Subproject commit 603985a962934aa59bf8dc8944715af512dcac88
+Subproject commit 1c1962cd0031616549a703de87c4f488bee4e29e
diff --git a/vim/bundle/vim-polyglot-darkcloud b/vim/bundle/vim-polyglot-darkcloud
index 6d3a4cc..ded2b8e 160000
--- a/vim/bundle/vim-polyglot-darkcloud
+++ b/vim/bundle/vim-polyglot-darkcloud
@@ -1 +1 @@
-Subproject commit 6d3a4ccfe9f9761846c8ebefd18be923983a429d
+Subproject commit ded2b8ebbe24da372c4db20b7a50328ca2f606d4
diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim
index 17e7a7c..08520a1 100644
--- a/vim/config/plugins.vim
+++ b/vim/config/plugins.vim
@@ -16,8 +16,6 @@
 "SYNTAX PLUGINS: {{{
     let g:vim_json_warnings=0
     let g:vim_json_syntax_conceal=0
-    let g:vim_markdown_folding_disabled=0
-    let g:vim_markdown_initial_foldlevel=2
 "}}}
 
 "BREEZE: {{{
@@ -57,6 +55,20 @@
     autocmd FileType gundo setlocal nocursorcolumn
 "}}}
 
+"MARKDOWN: {{{
+    let g:vim_markdown_folding_disabled=0
+    let g:vim_markdown_initial_foldlevel=2
+
+    "Remove default mappings then set them to fix issues with vimdiff
+    let g:vim_markdown_no_default_key_mappings=1
+    nmap ]] <Plug>(Markdown_MoveToNextHeader)
+    nmap [[ <Plug>(Markdown_MoveToPreviousHeader)
+    nmap ][ <Plug>(Markdown_MoveToNextSiblingHeader)
+    nmap [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
+    nmap ]c <Plug>(Markdown_MoveToCurHeader)
+    nmap ]u <Plug>(Markdown_MoveToParentHeader)
+"}}}
+
 "NEOCOMPLCACHE AUTOCOMPLETION PLUGIN: {{{
     let g:neocomplcache_enable_at_startup=1
     let g:neocomplcache_enable_smart_case=1
diff --git a/vim/config/settings.vim b/vim/config/settings.vim
index 1ec2dae..ade6ab5 100644
--- a/vim/config/settings.vim
+++ b/vim/config/settings.vim
@@ -67,12 +67,13 @@
     filetype plugin indent on
     syntax on
 
-    "set matching filenames to matching filenames
-    autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setf aspnet
-    autocmd BufNewFile,BufRead *.muttrc setf muttrc
-    autocmd BufNewFile,BufRead pacman.conf,yaourtrc setf sh
-    autocmd BufNewFile,BufRead archversion.conf setf archversion
-    autocmd BufNewFile,BufRead cjdroute.conf,cjdmaid.conf setf json
+    "set given filenames to various filetypes
+    au BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setf aspnet
+    au BufNewFile,BufRead *.gradle setf groovy
+    au BufNewFile,BufRead *.muttrc setf muttrc
+    au BufNewFile,BufRead pacman.conf,yaourtrc setf sh
+    au BufNewFile,BufRead archversion.conf setf archversion
+    au BufNewFile,BufRead cjdroute.conf,cjdmaid.conf setf json
 "}}}
 
 "GVIM: GUI CONFIG OPTIONS {{{