Add template_path and custom {{field}} arguments
Remove plurar machine name because it isn't used anywhere
Disable --raw rendering option of the default scaffold behaviour

We assume you don’t need two differtent templates, because supply you
own. So we disable the —raw route.
Make $machine_name also available for a custom template