Comment out a couple debug statements that will need to be dealt with manually
Delete dprint.py, we aren't using it anymore
Removed 4 stack=True in dprint statements
Normalize dprint's force argument so it can be easily converted
Remove the few binary=1 dprint args and mark the calls with a comment to deal with them later.
Comment out another dprint that will require manual intervention
Another one to deal with manually
Manually convert the few dprints with lines=1
Manually convert the few dprints with lines=True
Manually convert the few dprints with line=1
Remove box=True argument
Trivial fix to avoid adding complexity to the conversion script
Merge branch 'devel' of github.com:Tribler/dispersy into logging

Conflicts:
	dispersy.py
	script.py
Forgot to add a pass
Merge remote-tracking branch 'upstream/devel' into logging
Fix
Another manual fix needed here
Quick fix in conversion.py
Quick fix in conversion.py
Quick fix in conversion.py