much improved gitprompt
minor gitprompt fixes