-pathogen
Merge branch 'master' of github.com:ediblenergy/dotfiles

Conflicts:
	share/bashrc
	share/vimrc