merged in mainstream changes to zshrc from oh my zsh