Update to 0MQ4 + cleanup
Merge pull request #397 from PierreR/master

Update to 0MQ4 + cleanup