Merge pull request #594 from hurtonm/master

Simplify ZMQ_STREAM socket implementation
Simplify ZMQ_STREAM socket implementation, part II