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

diff --combined trouts
index 4e7f20f11751b3509f95bac197378c3fb04080ea,c53915cde947f8eaad5df4b3f4d39aa6069e8076..7b4ebd536409e423a2155d8ab616e71cbbb62263
--- 1/trouts
--- 2/trouts
+++ b/trouts
@@@ -152,6 -152,7 +152,6 @@@ compiles %s with -trigraph
  compiles %s with -Wtrigraphs
  turns %s into dogfood
  ><> ><> %s
 -sets %s and robhu up on a blind date
  gently taps %s with a menhir
  invests all of %s's money in a high-grade structured credit strategy enhanced leverage fund
  plays the viola at %s
@@@ -181,9 -182,11 +181,10 @@@ 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
  sneezes all over %s
  speculatively executes %s
  screams and leaps at %s
+ hits %s with a cockatrice corpse