instance variable for puppet3 upgrade
made manifests pass puppet-lint
Merge pull request #1 from arguello/tb/development

Tb/development