Unite code for user streams and tag streams.  Fixes #532.
Rename UserStream class to Stream. Fixes #532.
Merge pull request #569 from alecchap/532-unite-streams

Unite code for user streams and tag streams.  Fixes #532.