updated prompt with git branch
Merge branch 'master' of github.com:adamfeuer/dotfiles