rename data.aggregator to data.aggregator.batch
Merge branch 'master' of https://github.com/slawekj/wolf