Updated list of TODOs in CONTRIBUTING.md
Merge pull request #132 from astahlman/master

Updated list of TODOs in CONTRIBUTING.md
Minor style fixes: removed unused imports, commented-out code, etc.
More cleanup, mostly in docstrings
Merged upstream changes