Merge pull request #21 from nikicat/master

minor cleanup fixes
Bump version: 2.0 → 2.1
tox.ini cleanup