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

diff --cc trouts
index c0d4d8cc4e85033c46f8b5ac01aef301e8a27f42,c8b02cce4fa14ad348af23e1baa6721422c44de2..2d08454aa416b381ec82975461a81c338ce1e911
--- 1/trouts
--- 2/trouts
+++ b/trouts
@@@ -181,4 -182,6 +181,5 @@@ 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