Bumped version on development master to 2.1.0
Merge pull request #309 from hintjens/master

Bumped version on development master to 2.1.0