* first pass at making groups extend conversations

* update groups to inherit from conversation

* include groups in conversations list

* add combined streaming

* fix up test

* write a test for it

* fix the return statement

* small clean up