bugfix: CONLOST received when waiting for QUIT  - sorted
bug found by pauric added to "BUGS" to be dealt with later
tests rerun and cleaned up
DEBUG messaged added
sstream.py debugging messages improved, merge_logs.py - merges server and client log for nicer debugging
don't require RAW on stdin in sstream.py
Merge branch 'master' of ../sstream-pull/sstream

Conflicts:
	sstream-server.py
	sstream.py