no extra whitespace hilighting
Vundle
Vundle as a submodule
Merge branch 'master' of github.com:kekimmo/dotvim

Conflicts:
	vimrc
argh