ZMQ Changes

Please do not merge this request until Steven has reviewed it.