Update
Merge branch 'master' of https://github.com/calio/calio-tools

Conflicts:
	setup-env