Put the service document terms of use tags back the way they were.
Heavily refactor the sword code and add some tests.
More refactoring:

 * finish refactoring feed_server, and the tests that go with it.
 * unit tests for sword_server_common.
 * more tests for the sword api.
get the mysql transactions going again.