fixed git prompt (again). Maybe 20th time is the charm?

also added comments