Allow delete on keys - #20

bossmc wants to merge 2 commits into

Allow delete on keys#20
bossmc wants to merge 2 commits into
carbonfive:masterfrom
bossmc:allow-delete

Add delete function and tidy up unified code