Updated settings
Merge branch 'master' of https://github.com/laurent22/sublime-text-settings

Conflicts:
	Packages/User/Preferences.sublime-settings