Merge branch 'master' into public

* master:
  Minor tweak
  Wiki: cache Farkup HTML output
  Major Chloe overhaul: compiled templatess
  Better logging
  Fix bug spotted by Ed
  Remove unnecessary dependency on peg.expr
  Tweak stage2
  Tweak deploy tests to take less time
  Removing multimehtod dependency in perisistent.heaps
  Fixing xml.generator tests