Minor change
Fix merge issue
PS1 is now defined later so that it doesn't get overwritten by .bashrc