Replaced zmq.hpp with zmq2.hpp and zmq3.hpp.
Added an additional patch to zmq recipe.