bump version to 1.6.1dev
bump version to 2.0.0dev
Merge branch 'develop' of github.com:hpcugent/easybuild-framework into develop