Initial tweaks to collectd
update indexer script
Fix dependencies and includes on ES