Clean up & update Puppetfile and README.md