.
Merge branch 'master' of github.com:jclusso/configfiles

Conflicts:
	Users/jarrett/Library/Application Support/Sublime Text 3/Packages/SublimeLinter/package-metadata.json