Updating the puppet definition with assorted module fixes.