Changed table matching to be able to handle multiple local table matches for a single master table type (in case there are repeats of tables in a local file this will be useful). Integration of master coordinate matching not complete though