merged oh-my-zsh updates