Added bash color codes
Merge branch 'master' into prompt
Much more bloated prompt