update: big pull from oh-my-zsh upstream