These might be useful.
Some changes for Circuit. Default to a Circuit provider.

TODO: Get provider names more accurately.

* Tweak some regexes
* Switch roomid to long (todo: always keep as string)
Might want this too