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

diff --combined trouts
index 0c4c3d9bb69504561a0edf7cb896af96781cdcd3,4a0a9f2ea94f6dd4f1da730a1264a78d2e2376bb..d8f3cc70af74859f5b92ade97797e4ce3ab4c626
--- 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
@@@ -191,3 -192,4 +191,4 @@@ hits %s with a cockatrice corps
  sets %s up on a blind date with Jonathan Ross and Russell Brand
  gives %s a hard stare
  neuralyzes %s
+ press-gangs %s