Fixed _Channel._socket_close and tests.
Merge branch 'master' of git://github.com/ecdavis/pants into py3