Update oh-my-zsh downstream changes