bump middleware
uncomment accidentally commented test :-/
Merge pull request #712 from fommil/master

Housekeeping (and uncommenting some tests)
Merge remote-tracking branch 'upstream/master' into scala-2.10

Conflicts:
	.travis.yml
	build.sbt