clean-up
refactor
Merge pull request #2 from jasonmahony/jcm/puppet_overhaul

Jcm/puppet overhaul