Merge pull request #556 from hurtonm/master

Use socket options to select security mechanism
Cleaned up test pingpong code
plain_mechanism now uses options.as_server
- we need to switch to PLAIN according to options.mechanism
- we need to catch case when both peers are as-server (or neither is)
- and to use username/password from options, for client
Disable failing test for now
Merge pull request #557 from hintjens/master

Added as_server to options
Trivial fix to man page
Whitespace fixes
stdint.h is not available on all platforms
Merge pull request #558 from hintjens/master

stdint.h isn't available on all platforms
Added support for Travis CI
Fixed name of Travis file
Merge pull request #559 from hintjens/master

Adding support for Travis CI
Cleaned up router option code
- made consistent with options.cpp code
- added trace print for ongoing issue with Travis CI builds
Merge pull request #560 from hintjens/master

Working on Travis builds
Whitespace fixes
Add ROUTER socket option to introduce self(send an empty message) to new peers, to allow ROUTER<->ROUTER auto-discovery problem.
Add ROUTER socket option to introduce self(send an empty message) to new peers, to allow ROUTER<->ROUTER auto-discovery problem.
Merge branch 'master' of https://github.com/shripchenko/libzmq
Merge pull request #561 from shripchenko/master

Add ROUTER socket option to introduce self(send an empty message) to new peers, to allow ROUTER<->ROUTER auto-discovery problem.
Removed tracing for Travis builds