Cleaned up a memory leak in the client.
Pushed removing orphans until after the socket is closed.
Merge /srv/GITROOT/Tardis

Conflicts:
	TardisDaemon.py