move git aware prompt to bash_aliases
Merge branch 'master' of https://github.com/pauldinh/dotfiles

Conflicts:
	.bash_profile