merging the branch?

Are we ready to merge the branch schema with the trunk (as well as the
updated APA style)?

Simon, feel free to do that if you want. Otherwise, I’ll figure it out
(don’t recall how to do that in SVN!).

Also, let me know (John in particular, since it covers some stuff he was
interested in) if you have any further thoughts on the list and grouping
stuff before I add it.