New Settings
New changes
Merge branch 'master' of https://github.com/davidhemphill/sublime-text-settings

Conflicts:
	.gitignore
	Preferences.sublime-settings