Remove uneeded whitespace from files created on init
persistent2
Incomplete changes
All simpler dispatch tests pass
Switch yesod-core to use simpler dispatch
Merge remote-tracking branch 'origin/simpler-dispatch' into persistent2-simpler-dispatch
Added missing ViewPatterns
Fix a test
Merge remote-tracking branch 'origin/simpler-dispatch' into persistent2-simpler-dispatch
Add some yesod-routes benchmarks
Minor tweaks
Merge remote-tracking branch 'origin/simpler-dispatch' into persistent2-simpler-dispatch
Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch

Conflicts:
	.gitignore
	yesod-core/yesod-core.cabal
Remove unnecessary dep
Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch
Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch

Conflicts:
	yesod-auth/Yesod/Auth/HashDB.hs
Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch
Workaround for some meaningless warnings
renderBootstrap2
Merge remote-tracking branch 'origin/master' into yesod-1.4

Conflicts:
	yesod-auth/yesod-auth.cabal
	yesod-form/Yesod/Form/Fields.hs
	yesod-form/yesod-form.cabal
	yesod-persistent/Yesod/Persist/Core.hs