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

diff --combined trouts
index bd1d2961741c4c77c553f34273654275e955e5f1,04bc97b5c2f7ab25ed21d32a682de297d8982c6e..8c7bf462e488eedb87e34f97e224b9ebeb59a007
--- 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
@@@ -196,3 -197,5 +196,5 @@@ sends %s on an adventure holiday organi
  thous %s
  puts potato eyes down %s's shirt
  invites the Shame Orb to %s's party
+ recommends the closure of airspace downwind of %s
+ flies %s through a cloud of volcanic ash