Merge pull request #201 from stevepiercy/master

Docs cleanup, take 2!