Make the diamond::collector define do things in the right order.

Files in /etc/diamond/collectors/ are only addable after the package has been installed
(as that creates the directory), and the addition of extra collectors should notify the service
Sort collector parameters by name.

Otherwise you can end up in a situation where you continually re-write the collector config
as hash ordering is random. This makes the generated files predictable and idempotent
Merge pull request #8 from bobtfish/master

Fix ordering and idempotency