Replace skolem URIs with permanent identifiers when merging patches.
Add CLI for replacing skolem URIs in data loaded from a file, and be more careful about not accidentally duplicating IDs.
Cleaned up test files.
Merge master.
Merge branch 'arks'