Collectd no longer on ff-monitor
Merge branch 'master' of https://github.com/ff-kbu/bbkeys