Remove references to socket.AddressFamily

Removed references to socket.AddressFamily and IntEnum which were
introduced as of Python 3.4.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Merge and delete conflicting imports of socket
Merge branch 'jgalar-master'