Clean-up and added various git submodules for puppet