Modify templates to be puppet 3.x compliant
Add tests and support files