Source .gitprompt later to override bash-completion.d
Move __git_ps1 invocation to bashrc where it belongs
Some gitprompt cleanup