I've merged in Robert's integration branch, which seems to contain much of John's work too, and a couple of outstanding things from Aaron. Anything else that should go in and hasn't yet, let me know. Also: should I send mail like this, and what should be in it? Or would autogenerated mails be better? -- Martin