please let this fix things
Merge branch 'master' of https://github.com/trommel/dotfiles

Conflicts:
	.bash_profile