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

diff --cc trouts
index 2d08454aa416b381ec82975461a81c338ce1e911,3199f541384cd678431c594f98a15f8f9352a96e..b22c50f6b98695abaf0f7cb1e1941d93cfcc2e82
--- 1/trouts
--- 2/trouts
+++ b/trouts
@@@ -181,5 -182,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