0.9.11 issue 1652 Scott

The actual code belongs to Scott!

All I did was try to solve the conflicts. I might have even done it properly, though.

(There's also a pull request against Scott's own branch on his repo, but the diff looks scary, so this is just in case, and to be able to look at the diff.)

The ex-conflicted files are the work_approved_children and work_header_notes partials.

http://code.google.com/p/otwarchive/issues/detail?id=1652