wai 2.0
Fix some CPP
Merge branch 'master' into wai-2.0
Merge branch 'master' into wai-2.0
Merge branch 'master' into wai-2.0

Conflicts:
	yesod-static/yesod-static.cabal
WAI 2.0 updates
Merge remote-tracking branch 'origin/master' into wai-2.0
Merge branch 'master' into wai-2.0

Conflicts:
	yesod-bin/Devel.hs
Incomplete fast-logger 2.0 changes
fast-logger 2.0
Fix tests: force HTTP/1.1 in a few places
Merge branch 'master' of github.com:yesodweb/yesod