puppet manifest
fixed puppet location
Merge branch 'cg-4-feature-refactor-setup' of https://github.com/controlgroup/cg-init into cg-4-feature-refactor-setup
some clean up