batch.remove() now removes from db.keydir
style fixes based on review
Merge pull request #25 from kesla/batch-fix

batch.remove() now removes from db.keydir