docs fixes, including one that is probably breaking the docs build
Merge pull request #561 from seandst/i-broke-the-docs

docs fixes, including one that is probably breaking the docs build