Color things correctly
Merge branch 'master' of https://github.com/jedborovik/config