probably changed something or whatever
Merge branch 'master' of https://github.com/rwgeaston/silly-IRC-bots

Conflicts:
	bots/programmable.py
fix whole bunch of bugs