git, pull thyself.
Merge branch 'master' of github.com:gconnell/vimrc

Conflicts:
	bash_profile