settings updates
Merge branch 'master' of github.com:pertrai1/sublime-settings

* 'master' of github.com:pertrai1/sublime-settings:
  commit of preferences from air

Conflicts:
	Preferences.sublime-settings