Add new bundles for vim
Fix colors in gitconfig
Merge remote-tracking branch 'origin/master'

* origin/master:
  Rename conf file