Merge pull request #77 from ianbarber/master

Backport of test_connect_delay refactor from master
Patch from Rob Gagnon, backport of test fix from master. Resolves LIBZMQ-462