Fix a couple of docstrings and indentation errors.
Docstring additions and fixes.
Merge pull request #225 from bbatsov/cleanup

Docstring and identation cleanup