Update socks.py

This should make the changes so that socks.py will work in python 2.7.5
Moved the `Forwarder` class into `util.py`.
Refactored `Forwarder`; created `ForwardingProtocol`.
Merge branch 'socks' of https://github.com/nskinkel/309Project into socks

Conflicts:
	socks.py