renaming zmq.hh
renaming zmq.hh
Merge remote-tracking branch 'upstream/offline_2014_Aug_dbeck'
Merge remote-tracking branch 'upstream/master'
add active_queue feature: wait a bounded time for threads to progress with their tasks
Merge remote-tracking branch 'upstream/offline_2014_Aug_dbeck'
Merge pull request #20 from dbeck/master

renaming zmq.hh and comments changed in svc_config.proto