Updates/tweaks from the upstream git-prompt project.