simplifying and adding __git_prompt to PS1