Switch to Puppet provisioner
Add citation
Tidy up module definition