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

diff --combined trouts
index e749d047c56b7380e71f0e175a91360a1663152b,a860b86013bea3e3b02e193ebd6d04ec7250f964..862945d0b52da97b1c22a97f3f2cac164a3f4d6c
--- 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
@@@ -200,3 -201,4 +200,4 @@@ recommends the closure of airspace down
  flies %s through a cloud of volcanic ash
  buggers a weasel with %s
  posts %s a bobcat
+ disestablishes %s