Fix zsh install
Merge branch 'master' of github.com:phil-lopreiato/config-files

Conflicts:
	setup.sh