Make it build (but sacrifice unit tests)
Merge pull request #33 from ekr/multistream_make_it_build

Make it build (but sacrifice unit tests)