Stuff it
Merge branch 'master' of github.com:davidhemphill/sublime-text-settings

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