Improved colour handling in PS1 script.
Moved bashrc_common to bashrc.d/ps1.sh.
Merge branch 'master' into mac
Overhauled PS1 stuff. Much cleaner now.
Merge branch 'master' into mac