update
Merge branch 'master' of https://github.com/greatghoul/SublimeTextUserSettings

Conflicts:
	Preferences.sublime-settings