Fixing README.md - Merge issues
Fixing template puppet.conf.erb - Merge issues