update
Merge branch 'master' of https://github.com/mrmartineau/SublimeText3UserSettings

* 'master' of https://github.com/mrmartineau/SublimeText3UserSettings:
  update
  update

Conflicts:
	Preferences.sublime-settings