Updated to more sophisticated prompt.

Does a lot og checking on git branches, remote heads cached
locally, current branch, and so forth. Only does this fanciness if
git is confirmed to be installed by "which".
Removed extra line from prompt.

The newline following cwd in the prompt was unnecessary, and
has been removed.