Merge pull request #6 from simonpasquier/add-collectd-support

Add collectd support only when the server is enabled