upped conduit version dependency
Merge branch 'master' of https://github.com/jprider63/yesod

Conflicts:
	yesod-core/yesod-core.cabal
Merge branch 'master' of github.com:yesodweb/yesod
Version bumps
Fix a conditional
Merge remote-tracking branch 'origin/master' into yesod-1.4