Merge pull request #7 from tcpcloud/collectd_update

Global collectd update