Updates to oh-my-zsh from upstream