Scaffolding update
Upstream yesod-scaffold changes for #761