use vundle instead of pathogen
Merge branch 'master' of github.com:neumanrq/dotfiles

Conflicts:
	.bash_profile
	.vimrc