Better git prompt
Merge branch 'master' of https://github.com/stuhacking/dotfiles