Cleanup stuff I no longer use
Add bundle/puppet submodule