Merge pull request #2 from datasift/develop

Develop
Beautification to remove MSVC warning 4800 'int' : forcing value to bool 'true' or 'false'
Merge pull request #59 from mfsv/develop

Beautification to remove MSVC warning 4800...
Merge branch 'develop' of github.com:zeromq/zmqpp into develop
new 4.0 socket/context options, breaking change of add -> add_raw, add_const
Added basic monitoring support for sockets. Fixes #4
added basic curve wrappers
Changes for 4.1
Update CHANGES.md
Add wrapper around zmq_z85_decode and zmq_z85_encode
Add documentation to zmqpp::z85
Merge pull request #61 from xaqq/z85

Z85
Merge branch 'develop' of github.com:zeromq/zmqpp into develop
updated to use alternative x85 implemention
Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #60 from benjamg/develop

Changes for 4.0 support
Merge branch 'develop' into datasift

Conflicts:
	src/zmqpp/context_options.hpp