Bump yesod-core in cabal.config
Use upstream env-based session-key function
Use hspec v2 before/after syntax
Merge remote-tracking branch 'upstream/master'