A clean up of site.pp
Merge branch 'master' of centos6.5.prod.localdomain:/var/opt/lib/pe-puppet/git/modules into production