revert
revert

I accidentally committed some changes before they were ready for prime
time. This commit reverts those and keeps the small documentation
changes that I meant to commit.

hugovk/twarc,remagio/twarc,remagio/twarc,edsu/twarc,DocNow/twarc