Add settings changes from old Mac
Clean out packages I don't use
Merge branch 'master' of https://github.com/tmandry/sublime-settings

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