Remove /usr/* stuff; add entropy plugin back in since RPM build had it; add collectdctl/collectd-tg stuff back