Updated submodules to match develop and added option to run puppet to the generator