Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Package Control.sublime-settings
	Preferences.sublime-settings