Harmonizing akka versions.
Merge remote-tracking branch 'jdegoes/master'

Conflicts:
	core/build.sbt
Reverting the removal of extraneous buffering allows the zip tests to
succeed, which is troubling.