port from 0.3.0-pre.1 to 0.2.4
bump version to 0.2.5
manual merge develop
Merge branch 'develop' into release-0.2.5
remove reference to data
#16 meta copy bug - upgrade diskops dependency to enable shallow file copy
Merge branch 'release-0.2.5' into develop
repair damag done by merge from release-0.2.5