minor fixes for git 1.8
Merge branch 'master' of github.com:synacorinc/gitprompt