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

diff --combined trouts
index f778295d40232d22019c8309cf3d7454c6e551f8,b28335c5d4cb64ce0eab120613edacc110af0e36..5d83db23140fce4cc9040d3da247c8f52dc64055
--- 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
@@@ -194,3 -195,4 +194,4 @@@ press-gangs %
  feeds %s fugu kimo
  sends %s on an adventure holiday organised by Weyland-Yutani
  thous %s
+ puts potato eyes down %s's shirt