Merge pull request #1 from yesodweb/master

Full update