Cleaned up some language in the docs
Merge branch 'master' into orm