Add more modules to Puppetfile
Remove broken forge modules