Consolidated Stale Pull Requests & Cleanup

* Resolved conflicts from olethanh's stale pull request #29, squashed his commits
* Included jlowin's fixes from #54
* Fixed some typos, added some docstrings
Do you know why this change was made?