[Reviewer: Andy] Update documentation

Andy, can you please review these updates to the docs (I'll also change the wiki)
Fixes #84