Switched to using the controller sub-generator.

This means I don't have to keep two copies of the default controller
layout.