Changed to use PROMPT_COMMAND, changed bash colour commands back to render properly
Fixing weird merge-without-branch conflict