removing extra files included in earlier commit and fixing a few problems with
the Puppetfile and manifests/site.pp files