Minor fix in socket.js for getRooms query, added
getRooms as a method on the angular factory
Merge branch 'staging' of http://github.com/scrollback/scrollback into staging