Merge branch 'better-git-prompt-integration'

* better-git-prompt-integration:
  Clean up the PS1_PRE and PS1_POST declarations
  Add commented out defaults for 2 more GIT_PS1_* options
  Improving the integration with git