Several minor fixes/improvements, and the addition of a flag

that by default disables course import for XMLModuleStores.