Fix display of current branch and whether or not the branch is dirty on the PS1

Change-Id: I02765a93c137ca452597109bac5a4d061f165322