Revert "Include the puppet submodules which much of this module will be moved into"

This reverts commit 2129c26979f9836ca23aedf4a1356c5492e695df.