Tweak
Merge branch 'master' of github.com:bjhess/dotfiles

Conflicts:
	bash_profile