Switching to Vundle.
Merge branch 'master' of github.com:wesbaker/vim

Conflicts:
	.gitignore
	vimrc