Allow ingests of clips of the same source

Rewrite and improve asset ingest specifically for json.  Untested.