Tweaking the way in which forms are merged to allow for more flexible merging

When tabs, fieldsets and fields are flagged for deletion - keep the field in the definition still. This means that we can have multiple levels of merging and have field deletion work across them all.