pref
Merge branch 'master' of https://github.com/singuerinc/dotfiles

# By Nahuel Scotti (3) and Mathias Bynens (1)
# Via Nahuel Scotti
* 'master' of https://github.com/singuerinc/dotfiles:
  pref
  monokai iterm
  webstorm settings update
  .osx: Suppress error messages when running `~/.osx` twice