updated git prompt, changed GIT_PS1_SHOWUPSTREAM