Puppetfile refactor

This patch contains a Puppetfile refactor and associated changes to get the Cisco version of collecd working