Add some bundles for vim for git
Merge branch 'master' of https://github.com/jpalmer/dotfiles
fix merge