[zsh] never autoupdate oh-my-zsh
Merge branch 'master'

Conflicts:
	zsh/zshrc