merge changes from nathanmarz/storm

include changes in zmq.clj