Merge branch 'master' of /home/matthew/programming/irc/bot/

diff --combined trouts
index 862945d0b52da97b1c22a97f3f2cac164a3f4d6c,5c599f2d93711941fad61fb4096aa13f34607f8f..7b838c2778a543162ded41745f1a45c046aef3cc
--- 1/trouts
--- 2/trouts
+++ b/trouts
@@@ -180,6 -180,7 +180,6 @@@ forces %s to listen to David Cameron's 
  sticks %s in a small room with Ian Paisley
  rains she-trolls down upon %s
  rains wheelbarrows on %s
 -nominates %s for the UK Usenet Committee
  hits %s with a replica of Milan cathedral
  has %s transported to Botany Bay
  petitions the PM to abolish %s
@@@ -201,3 -202,5 +201,5 @@@ flies %s through a cloud of volcanic as
  buggers a weasel with %s
  posts %s a bobcat
  disestablishes %s
+ sets %s on fire
+ creates an "I hate %s" group on Facebook