more git prompt stuff
more minor prompt changes