diff --git a/vim/bundle/emmet-vim b/vim/bundle/emmet-vim
index 3d6862d..25d321c 160000
--- a/vim/bundle/emmet-vim
+++ b/vim/bundle/emmet-vim
@@ -1 +1 @@
-Subproject commit 3d6862d5d10c68ccfc19ae1cc5121473511b69c5
+Subproject commit 25d321c66fd7b0358ccb3bb2c95be5a0f332d10c
diff --git a/vim/bundle/vim-polyglot-darkcloud b/vim/bundle/vim-polyglot-darkcloud
index 0ae00f2..d83fb86 160000
--- a/vim/bundle/vim-polyglot-darkcloud
+++ b/vim/bundle/vim-polyglot-darkcloud
@@ -1 +1 @@
-Subproject commit 0ae00f25ba649a0ec73d3b151bb46984cb41b612
+Subproject commit d83fb86f05baac08f84e9c4e3031a9cb874b6f70
diff --git a/vim/config/after.vim b/vim/config/after.vim
index 97aaf7c..c34b18f 100644
--- a/vim/config/after.vim
+++ b/vim/config/after.vim
@@ -31,14 +31,15 @@ endif
     "set given filenames to various filetypes
     autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setlocal ft=aspnet
     autocmd BufNewFile,BufRead *.gradle setlocal ft=groovy
-    autocmd BufNewFile,BufRead *muttrc setlocal ft=muttrc
-    autocmd BufNewFile,BufRead *vimpagerrc setlocal ft=vim
-    autocmd BufNewFile,BufRead *ircd.conf setlocal ft=json
-    autocmd BufNewFile,BufRead *pacman.conf,*yaourtrc setlocal ft=sh
     autocmd BufNewFile,BufRead *cjdroute.conf,*cjdmaid.conf setlocal ft=json
+    autocmd BufNewFile,BufRead *ircd.conf setlocal ft=json
+    autocmd BufNewFile,BufRead *muttrc setlocal ft=muttrc
+    autocmd BufNewFile,BufRead *pacman.conf setlocal ft=conf
+    autocmd BufNewFile,BufRead *vimpagerrc setlocal ft=vim
+    autocmd BufNewFile,BufRead *yaourtrc setlocal ft=sh
 
     "filename specific settings
-    autocmd BufNewFile,BufRead PKGBUILD setlocal iskeyword-=.
+    autocmd BufEnter,FileType sh setlocal iskeyword-=.
 
     "filtype specific settings
     autocmd Filetype text,mkd,mkdc,gitcommit,notes,mail,notmuch,rst,taskreport setlocal nonumber spell nolist linebreak breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing