Major bash PS1 updates
Merge conflict solved