pathogen
Merge branch 'master' of github.com:sjsrey/vimdot

Conflicts:
	vimrc