Clean up documentation

Also do some of the renaming discussed with @johnpmayer.