Change configuration comments to match what is actually checked. Add some that were missing.
Merge branch 'master' into bugfix1
Merge pull request #52 from jonas054/bugfix1

Correction of comments in config file