Removed something that looks like a merge issue from spec_helper
Fixed a race condition in the stream ID handling

Also wrote a more concurrent integration tests to stress the code a bit better. Only discovered this because of JRuby.