Cleanup blockmap on update (fixes #889)

Not sure how to deal with the poluted database.

I have two options I guess:
1. Write a migration thing which gets passed a database handle, clearing all data.
2. Hash the block I've read during iteration, and fix it up there (but perhaps also only on last puller iteration before we fail)