Client now receives messages and is thus useful
Receive latest changes from 'master' into client-receive-messages
Removed extraneous code