New OS
Update zshrc and merge in old settings.
Fix oh-my-zsh alias conflicts