cleanup build
Merge branch 'on_spray-can_1.1' into on_jetty_1.1

Conflicts:
	build.sbt
Merge branch 'on_jetty_1.1' into on_jetty_1.0

Conflicts:
	build.sbt