Merge pull request #8 from tcpcloud/collectd_update

Global collectd update