Update to master; make color constants public
Update to master + cargo-lite.conf
Fix tests
Merge pull request #7 from cmr/master

Some fixes