Upgrade pathogen
Merge branch 'master' of https://github.com/btashton/dotfiles

Conflicts:
	_vim/autoload/pathogen.vim