Clarification
Layout changes, moved ls and grep stuff to separate files, git status not coloured same as $, not ideal but the colouring is $ is working again
Moved PS1 logic into function and then call it from PROMPT_COMMAND variable, thanks to http://stackoverflow.com/questions/24562629/setting-a-variable-within-a-bash-ps1/24563320#24563320