Merge pull request #670 from ricnewton/master

Fix cmake build
Merge branch 'master' of https://github.com/zeromq/libzmq