jszakmeister-prompt: only trim if we have enough length to do it
vcs-status: shorten the upstream name in some cases

If the local and remote branch names match, but the remote is something
other than origin, then use "remote/..." as the upstream branch name.