Merge pull request #35 from eigenhombre/fix-imports-again

Fix import issue
bump version to 0.2.2
Merge pull request #33 from eigenhombre/more-pep8

More PEP-8 fixes
Merge branch 'master' into add-partition-by