Merge pull request #799 from paul-rouse/master

Mitigate yesod devel load (#767) by increasing a timeout
Version bump
Scaffolding changes for Ctrl-C
Revise previous fix (#799) to yesod devel timeout