Use underscore to separate words
Help the Socket Server clean up after itself
Ignore client-side SSL exceptions
Add url_replace()
Server close functionality should be separate
Add parse_addr function
Merge commit 'thee/net~1'

Conflicts:
	net.py