trying to recover from glitch in parent repo

the parent repo shouldn't have been tracking these files, but it was.
i've lost some uncommitted work, but i think i've mostly fixed
everything.