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

Conflicts:
	Default.sublime-commands
	SublimeLinter.sublime-settings