zshrc+iterm2 changes merged