Fix git prompt showing '...origin/master' and update to the latest .vim submodule commit id

Signed-off-by: Michael Welter <michael@cetoncorp.com>