Update z link
Update
Merge branch 'master' into ubuntu
Merge branch 'ubuntu' of github.com:OliverJAsh/prezto into ubuntu

Conflicts:
	runcoms/zshrc