Squashed 'ocamlczmq/' changes from 2ef98ae..582d025

582d025 Fixes for upgrading to CZMQ 2.2.0
4d504b2 Call aclocal from autogen.sh
9e6d8a3 Merge branch 'master' of github.com:chsticksel/ocamlczmq
596d381 Updated CZMQ to version 2.2.0
5bfa902 Squashed 'czmq/' changes from 8c6a6bc..b22dd58
78c4460 Updated ZeroMQ to version 3.2.4
af71eab Squashed 'zeromq/' changes from fd02f84..a52e1d6
4c0ce5c Removed commented lines
2aa6c49 Merge branch 'master' of github.com:chsticksel/ocamlczmq
b35f9e0 Removed autogenerated file

git-subtree-dir: ocamlczmq
git-subtree-split: 582d025e3aea12cd4718c74482a48aa49a91f867
Merge commit '0e0586ecfb868fcb086e7bfa01d01ac1761d5a6a' into develop