zsh and iterm config updates
merging