Delete / merge node functionality needs to be restored

[jdanish]

Ideally this works as before - there is a delete button if in admin mode. If you go to delete a node you have the option to merge it into another. If needed we could separate these out and do delete now and merge later.

[jdanish]

Done with #39