Merge pull request #38 from hermanschaaf/master

Requirements, fix tests, bump version for PyPI
pep8
Merge pull request #39 from shawnps/master

pep8
Merged conflicts