Rebased and refactored on top of Niko's latest room-list branch.  WIP.

https://bugzilla.mozilla.org/show_bug.cgi?id=1074686