Various changes
Merge branch 'master' of https://github.com/gabloe/CIMetricsAggregator

Conflicts:
	statsproj/openstack_stats/static/info.php
	statsproj/openstack_stats/static/plotting.js