Merge branch 'master' into socket_cleanup
Merge branch 'master' into socket_cleanup
Rename socket callback, streamline opts handling

Rename the callback a proc, and refactor to do all the opts handling in
initialize.
Merge pull request #9 from woodbusy/socket_cleanup

Socket cleanup