make the git prompt a little more flexible
Merge branch 'master' of https://github.com/jmullan/dotfiles