Fix some vim crap
Merge branch 'master' of github.com:squeeby/dotfiles

Conflicts:
	.gitmodules
	.vimrc