Show git branch in bash prompt
Merge branch 'master' of https://github.com/lboynton/dotfiles

* 'master' of https://github.com/lboynton/dotfiles:
  Formatting
  Formatting
  Add some more git aliases