Rabbitmq support

Further support for rabbitmq.  Also make the client work correctly.