Bump minor version to 2.1.x-dev
Merge pull request #74 from simensen/master

Bump minor version to 2.1.x-dev