merged in Jason's changes, mostly a lot of "todo" items added to spec/index.rst in late August 2013