Update docs
Merge pull request #1225 from bjlittle/update_docs

Update docs