added iterm prefs
Merge