Revert "Removed OTEnvelope::(Get|Set)AsBookendedString."

This reverts commit da6ef5bba4f5422dac4be4b24672f7bf7a8377f2.
Merge pull request #306 from benma/revert

Revert "Removed OTEnvelope::(Get|Set)AsBookendedString."
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
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.
split method processXmlNode
OTMessage: move code to updateContentsByType
split OTMessage::updateContentsByType into small methods
Reformat code from previous commit
reorder methods
Group methods into class