Bump scala to 2.10.2 and finagle-http to 6.5.0
Merge branch 'master' into spray1.1-M8

Conflicts:
	build.sbt