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

Conflicts:
	easy_diff.sublime-settings