Merge pull request #672 from hintjens/master

Renamed test_connect_delay to test_immediate to match name of option
Merge pull request #673 from hintjens/master

Renamed new socket options to be clearer
Fixed packaging for source distribution
Next version off libzmq master is 4.1.0