Revert SocketType to it's previous version

The reason is because we intend on becoming the API for more than one implementation of ZMTP.
Merge remote-tracking branch 'origin/master'