Update submodules
Update vim-ps1 bundle
Update other submodules
Merge branch 'master' of https://github.com/heaths/vimfiles