Merge common code changes
Update version number
Correctly compute hash values (inc using correct sizes)
Fix file/block deletion