Merge pull request #78 from hintjens/master

Reverted fix for LIBZMQ-504
Closes LIBZMQ-504.

This time correct backport from 3.x branch.
Merge pull request #79 from BoresExpress/master

Closes LIBZMQ-504.
Added support for Travis CI