Add helpful message when __git_ps1 is unavailable
Fix branch ahead warning for latest version of git...

We should probably have a better way of abstracting out how many commits
behind/ahead we are - is there any git plumbing that might be helpful?