Restructures teh PS1 stuff so it should be be much simpler to maintain.
The git prompt is now added to ps1-extras, rather than being a complete replacement.