added iterm settings
merge