OTLog: fix macros
Merge pull request #309 from toxeus/fixMacros

OTLog: fix macros
Fix some -Wshadow warnings.
Merge pull request #307 from benma/develop

Fix some -Wshadow warnings.
Add support for ZeroMQ 4.0.5

Add new .so-names to the search path (I'm guessing the OSX and Windows names
here)

Don't parse and check patch version now.

Fixes #305