Some more opts/refinements for git prompt
Enhance parsing of hg status a bit too