disable zsh auto update
Merge branch 'master' of https://github.com/chrismcbride/dotfiles

Conflicts:
	.zshrc