updated prompt to work with new version of git
Merge branch 'develop' of https://github.com/dbrockman/dotfiles into develop