Bumping version to 2.1
Update to dev version
Update build and changelog