Added Chris' tool for merging edXML, with minor cleanups to make it usable for other courses