first pass at cleanup
refactoring
Merge pull request #1 from jasonmahony/jcm/puppet_overhaul

Jcm/puppet overhaul