Removed some unnecessary output from the html
Various fixes
Merge branch 'master' of https://github.com/gabloe/CIMetricsAggregator