Adding zsh
Merge branch 'master' of https://github.com/022/install_stuff

Conflicts:
	install_stuff.sh