Consolidated Stale Pull Requests & Cleanup

* Resolved conflicts from olethanh's stale pull request #29 
* Included jlowin's fixes from #54
* Fixed some typos, added some docstrings