Minor documentation template fixes.
Merge pull request #266 from pelson/doc_fixes

Minor documentation template fixes.
Merge remote branch 'upstream/v0.7.x'

* upstream/v0.7.x:
  Minor documentation template fixes.