Layout changes.

* Pushed prompt down one line.
* No longer collapses pwd to env variables.
* Virtualenv pushed to right prompt.