Fixes to elroy.
Merge conflicts un-conflicted.
Updates to elroy pubsub over ws.
Merge pull request #9 from elroy-io/pubsub2

Pubsub2