Version bump to 2.1-SNAPSHOT
Merge branch 'master' of github.com:FlossWare/core