Various vim changes
Merge branch 'master' of github.com:llarsson/dotfiles

Conflicts:
	.gitmodules
	vim/vimrc