Add colordiff
Merge branch 'master' of github.com:calio/calio-tools

Conflicts:
	setup-env
Add cheat tool to setup-env