General changes
Merge branch 'master' of https://github.com/typoon/config-files
Changed colors!