Change to Vundle
Add ignore
Merge branch 'master' of git://github.com/hotchpotch/dotfiles-vim

Conflicts:
	.gitmodules