Cleaned up Config subsets and grammer
Merge pull request #718 from VapourDrive/1.7

Cleaned up Config subsets and grammer