Moving final cucumber-cli scenarios to new feature

Now that all that's left in `cucumber-cli.feature` is the `--name` option,
rewrite that and move it to its proper place in the new structure.