report_collectd bug fixes
Merge branch 'uw-exometer-report' of github.com:Feuerlabs/exometer into uw-exometer-report
Merge Ulf's bug fixes with Magnus's