Removed pathogen
Merge branch 'master' of github.com:wokumura/dotfiles

Conflicts:
	vim/bundle/vim-fugitive