Neighbors now reads arbitrary files correctly
c1-firms now covers old c2-firmsap
Redid nearest neighbor matching