Revert "move git_ps1 to begining of PS1 to avoid color problems"

This reverts commit 1496854b331927ab54141185b714876dbc922cef.
ok, green will be the parentheses for git_ps1