I wasn't clear about this in the original message, but I think this is ready to merge in its current form. I'd love to hear from reviewers who can poke holes in that :) Cc Eric and Taylor who have given the most review on v1 (thanks again!). I believe I've addressed your comments and I'd be interesting in hearing your thoughts on v2.
