Change default shell to zsh in setup-env
Merge branch 'master' of github.com:calio/calio-tools

Conflicts:
	bash_extra