Updated scaffolding
Merge branch 'master' into yesod-1.4
Scaffolding update to Yesod 1.4