Change ddc to ddi, change merge tool to meld & sundry other changes.