Fixes to expect, some to the way it wraps, etc.
Fixes to expect, some to the way it wraps, etc.

frumiousbandersnatch/supybot-code,ProgVal/Limnoria-test,haxwithaxe/supybot,buildbot/supybot,ProgVal/Limnoria-test,Ban3/Limnoria,kblin/supybot-gsoc,raboof/supybot,mazaclub/mazabot-core,Ban3/Limnoria,jeffmahoney/supybot,prashantpawar/supybot-rothbot,mazaclub/mazabot-core