Merge pull request #1 from tcpcloud/collectd_update

Global collectd update