Fixed merge errors caused by faulty mergetool setup - also deleted xhtmlEpub stuff from dtbook/frameworks