Let Slim request and response objects use Guzzle\Stream
Clean up test output
Fix merge conflicts