Update bash
Merge branch 'master' of github.com:sjhcockrell/dotfiles
Merge branch 'master' of github.com:sjhcockrell/dotfiles

Conflicts:
	bash_profile