Merge tag 'v0.4.0'

Conflicts:
	build.sbt
	examples/src/main/scala/com/example/http4s/servlet/JettyExample.scala