Clean up code, make tests run
PEP8 changes
PEP8 line length change
Merge pull request #3 from khandelwal/master

Style and Readability Changes