Merge pull request #27 from elemoine/stacklight-aggregator

Fix and improve the aggregator