fix user name display
recolour and rearrange git prompt info