Merge pull request #135 from rootcoma/formatting

Config groups, minor formatting