merging input/output controller, adding tests, fixing bugs
Merge branch 'streaming-buffers' of github.com:tumblr/colossus into streaming-buffers

Conflicts:
	colossus-tests/src/test/scala/colossus/controller/InputControllerSpec.scala
	colossus/src/main/scala/colossus/controller/InputController.scala
	colossus/src/main/scala/colossus/controller/OutputController.scala