Upstream merge, new message fields

Master has been merged with the upstream and new fields have been added to the Message struct, intended to be populated by the "match" message type, when the websocket stream is authenticated.