Replace scalalogging with log4s. #65
slf4s was something else, this is log4s.
Bump to log4s-1.1.2.
Bump to Scala 2.11.4.
The master branch is 'master' again.
I think this should be an example of how to do thread pools

The method `withThreadPool` should be promoted to the ServerBuilder trait.
Promote specification of a thread pool to the ServerBuilder

Its going to be a pretty core concept anyhow.
Update the changelog
A wee bit o' Scaladoc before the release.
Switch to blaze-0.3-SNAPSHOT for swift bug watch period before release
Ugprade to scalaz-stream-snapshot-0.6a.
Move http4s to the http4s-websocket package
Merge branch 'release-0.4' of https://github.com/http4s/http4s into release-0.4
Revert to Tomcat 8.

That was an accidental checkin.
Fix UriTranslation. Closes #69.
Merge branch 'release-0.4' of https://github.com/http4s/http4s into release-0.4
Remove unnecessary NotFound() from the example route
Upgrade to scalaz-stream-0.6.
Publish snapshots from release branch.
Merge branch 'release-0.4' into HEAD; bump to 0.5.0-SNAPSHOT.

Conflicts:
	.travis.yml
	core/core.sbt
	project/Http4sBuild.scala
	servlet/src/main/scala/org/http4s/servlet/Http4sServlet.scala