Git stuff tweaked, considering moving to __git_ps1 from vcprompt