Initial commit
Adds puppet submodules
Merge commit