merge

hey steven, 
i merged my stuff into the bot.
plz review carefully and then, if you like it, pull pull pull.

cheers,
moe