misc changes
Merge pull request #1256 from dimagi/doc_changes

misc changes