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

diff --combined trouts
index baa9a3dbeb54e04dea0b1619b37ae682ed60078d,f459097d78bc9e22bc3f25b7e0c817634d394cbe..56f0800c7820d45f14e2f5b475e2461e4948e962
--- 1/trouts
--- 2/trouts
+++ b/trouts
@@@ -181,6 -181,7 +181,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
@@@ -193,3 -194,4 +193,4 @@@ gives %s a hard star
  neuralyzes %s
  press-gangs %s
  feeds %s fugu kimo
+ sends %s on an adventure holiday organised by Weyland-Yutani