updating pathogen
Stop yelling at me!
Merge branch 'master' of github.com:brettbuddin/dotfiles

Conflicts:
	zsh/modules/autojump.zsh