Improve __git_ps1 behaviour

Use __git_ps1 to build PS1 using PROMPT_COMMAND, per the header to
git-prompt.sh.  Enable all the options!