fixed .gitconfig
Merge branch 'master' of github.com:jimmydburr/dotfiles

* 'master' of github.com:jimmydburr/dotfiles:
  updates
  updates
vim bundle madness