Added aggregation options
Flexible selection of metrics
Merge branch 'metricvsmetric' of github.com:Aloja/aloja into test