Cleans up the bash prompt

It's now much easier to modify. It spans 2 lines, and makes standard use of
__git_prompt.

It doesn't keel over if there's not __git_prompt, either.

TODO - make a function for colourizing the output.