Gmiranda feature branch

Hey steven I would still like dry-run to create the template files