Simplify color handling.
Merge branch 'master' of github.com:mikelward/conf