Update settings
Merge branch 'master' of https://github.com/Beevik/sublime-settings

Conflicts:
	Preferences.sublime-settings
Updaet settings