furthercleanup
Merge branch 'master' of github.com:futuregrid/cloud-metrics
merging the contributions