vanilla sphinx docs
docstring edits for PEP8 compliance
Merge branch 'sphinx'