Fixed display of git PS1 when not on a branch.
Merge remote-tracking branch 'origin/master'