Merge branch 'release/0.16' into develop
started enhanced support for unfeezing
bugfix
enhanced support for zenodo and datahub.io integration
removed file from scaffold which introduced dependency on psycopg2
bumbed version number
Merge branch 'release/0.17'