Updated through new git (under cygwin)
Added a couple of more environment variables so that prompt can pick them up