Fixed git-prompt config to work with the changed output of git 1.8.5+
Merge branch 'master' of github.com:pvdissel/dotfiles