Fix improper tagging of spine items as "non-linear"

When a regular Content Document was present both in the resource file
set and in the spine fileset, it was annotated as `non-linear` in the
spine. This change set fixes that by diffing the primary file set when
computing the set of non-linear content docs.