Added changes from jemfinch.
Added changes from jemfinch.

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