rename delete layer to edge-delete
refactoring read wrapper code so we can reuse layer matching in merge and edge-delete
Clarify/improve some merging code with justin

Conflicts:
	src/flatland/jiraph/merge.clj
	src/flatland/jiraph/wrapped_layer.clj