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

diff --combined trouts
index 5d83db23140fce4cc9040d3da247c8f52dc64055,ea34304c60ed5361703697aaaff9d9fdcac994cf..bd1d2961741c4c77c553f34273654275e955e5f1
--- 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
@@@ -195,3 -196,4 +195,4 @@@ feeds %s fugu kim
  sends %s on an adventure holiday organised by Weyland-Yutani
  thous %s
  puts potato eyes down %s's shirt
+ invites the Shame Orb to %s's party