Merge pull request #925 from hintjens/master

Fixed comment
added uncommitted norm_engine changes
Merge pull request #926 from bebopagogo/master

added uncommitted norm_engine changes
Fix cmake build on windows.
Fix travis build.
Fix travis build.
Fix tabs
fixed another missed norm_engine issue for non-norm build
Merge pull request #927 from ricnewton/master

Fix cmake build on windows & travis build.
Merge pull request #928 from bebopagogo/master

fixed another missed norm_engine issue for non-norm build
Add vs2013 solution and build for (v120) of libzmq project.
Add delays in test_connect_rid to allow time for socket to close before address reuse.
Fix tabs
Merge pull request #930 from ricnewton/master

Add delays in test_connect_rid
Fixed wrong assert in zmq_recv

zmq_recv returns bytes count, not error code, so 'assert (rc==0)' behaved completely wrong
Remove delays and destroy/recreate context between tests
Merge pull request #931 from Dahko/patch-1

Fixed wrong assert in zmq_recv
Merge pull request #932 from ricnewton/master

Remove delays in test_connect_rid and destroy/recreate context between tests
fix test_fork

* was problem on debian/wheezy
Merge pull request #933 from soundart/master

cmake: fix test_fork