Consolidate imports from shutil and add test for new object matching
Refactor object matching to increase speed

This will also make it easier to switch to satrapy's coordinate matching when that becomes available. The essentially change was to first try matching whatever the last object to match was before checking the full object list. Closes #76