Harmonized aggmode naming between conf and code
Merge pull request #53 from andig/aggmode

Harmonized aggmode naming between conf and code