more git aliases, minor update to PS1 output
Merge branch 'master' of https://github.com/bradegler/dotfiles