Make test_socket_manager tests pass on PyPy

by applying patch from pjenvey on IRC:
http://paste.ofcode.org/a588X46F8gNdFDSHDtK5NP
.travis.yml: Add pypy but allow fail

Conflicts:
	.travis.yml
update against trunk and add pypy to tox.ini