Reset to initial yaml merge, fix puppet-modules.sh Readme

The yaml files are still here, but not referenced in the readme
The puppet-modules.sh is also fixed to point to the "right" repo
Merge branch 'multi-node' of https://github.com/robertstarmer/folsom-manifests into multi-node