Remove iterm2 prefs and update sublime
Merge branch 'master' of github.com:danrabinowitz/dotfiles

Conflicts:
	Library/Application Support/Sublime Text 2/Packages/User/Preferences.sublime-settings