Update to latest proposal

Unbeknownst to me, @thomasboyt had and I had been working on this at the same time. His PR is #18. I think his is probably better, but I wanted to put this here for posterity and because this includes stuff that isn't related to the spec update that I still want to include.