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

Conflicts:
	easy_diff.sublime-settings
	tabs_extra.sublime-settings