Adding space between function and args to conform with style
Changed context_t to use new zmq_ctx_* functions
Merge branch 'master' into tests

Pulling in the new zmq.hpp file