Fixing my environment.
Fix terminal colors.
Fix prompt function for setting the PS1/PS2 vars.

The original implementation was complicated and needed refactoring.  The
new implementation sets PS1 such that it calls the function rather than
having the function set PS1.