Update to new blaze build layout
Merge branch 'develop' of https://github.com/http4s/http4s into develop

Conflicts:
	project/build.scala