Use zsh as default shell
Merge branch 'master' into php53

Conflicts:
	provision.sh