Updated some local filetype settings, updated submodules.
Merge branch 'master' of github.com:zfogg/.vim