Updates based on review; closes #395
Merge branch 'issue-395'
Merge branch 'master' of github.com:rethinkdb/docs