Add z
Merge branch 'master' of github.com:ahutchings/dotfiles

Conflicts:
	zshrc