Revert PS1 to earlier version, plus __git_ps1