Add cdimagetools; remove diffpdf