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
Merge pull request #311 from OttoAllmendinger/pr-zeromq405

Add support for ZeroMQ 4.0.5
Normalize includes in OTString, OTData, OTLog.
Merge pull request #304 from benma/cleanup

Normalize includes in OTString, OTData, OTLog.
Fix some -Wshadow warnings.
Merge pull request #315 from benma/shadow

Fix some -Wshadow warnings.