Use vundle
Merge branch 'master' of github.com:pkallos/dotvim

Conflicts:
	.vimrc