slight comment grammar and spelling changes
a few more cleanups of docstrings
a few more docstring modifications
merge from upstream
Merge pull request #367 from tbrooks8/sprint-branch

Sprint branch