More git_prompt changes

There are three changes:

1. Grab the "verbose name" feature from git.git
2. Re-add the space character as a default upstream_prefix character but only when showupstream is verbose.  (This matches the original git.git behavior.)
3. Remove the custom handling of the color variables in favor of just passing arguments to set_color.