updated omz
silent doesn't work that way
Merge branch 'master' into remote-host

Conflicts:
	oh-my-zsh