iterm2: update preferences
sublime2: update preferences
Merged in master branch