config changes
Merge branch 'master' of https://github.com/smayfield/NWDistrictScouts

Conflicts:
	NWDistrictScouts.sublime-workspace