Merge pull request #490 from toxeus/socket_cleanup

Socket cleanup
Simplified receiving to do without retries and all that.
Modified to have a connect in preparation to move logic from socket into connection.