Fixed .gitignore for mains in root
Restore structure to targets lost during nonrecursive refactor.
Merge pull request #1242 from pmienk/master

Restore structure to targets lost during nonrecursive refactor.
Problem: qt-android build doesn't fully work for downstream builds
Solution: Fix the qt-android build
Merge pull request #1243 from jemc/master

Problem: qt-android build doesn't fully work for downstream builds
Fix typo: addres -> address
Fix typo: endpoind -> endpoint
Merge pull request #1244 from johntconklin/master

Fix typo: addres -> address
Problem: zmq_ctx_term has insane behavior by default

Solution: document this with a clear warning. It would be
nicer perhaps to change the default LINGER to e.g. a few
seconds. However this could break existing applications.
Merge pull request #1246 from hintjens/master

Documentation fix for zmq_ctx_term
Problem: default LINGER value is insane

Solution: use a sane value, e.g. 2 seconds

Fixes #1247
Problem: No error-checking of setsockopt ZMQ_CURVE_* z85 keys. Solves #1094.
Add tests for issue #1094.
Merge pull request #1250 from c-rack/master

No error-checking of setsockopt ZMQ_CURVE_* z85 keys. Solves #1094.
Merge pull request #1248 from hintjens/master

Problem: default LINGER value is insane
Use consistant spelling in documentation

behavior -> behaviour
initialize -> initialse
initialization -> initialisation
Fix typos.
Merge remote-tracking branch 'upstream/master'
Merge pull request #1251 from johntconklin/master

Use consistent spelling, fix typos.
Problem: return code of sodium_init() is not checked.

There are two todo comments in curve_client.cpp and curve_server.cpp that suggest
checking the return code of sodium_init() call. sodium_init() returns -1 on error,
0 on success and 1 if it has been called before and is already initalized:
https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c