Commit from MBA
Merge branch 'master' of https://github.com/chuckhendo/sublime-plugins

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