Bump version to 1.2.1 and pep8
Merge pull request #21 from hannseman/master

Bump version and pep8-fixes