Add git branch prompt
Merge branch 'master' of https://github.com/nobrick/dotfiles