initial commit
Merge branch 'puppet-enterprise'