some clean up
making de-duplication more efficient
adding a long_id
cleaned up stray lines after conflict; cleaned up column names based on real data
generating a long id for baseline data, and putting in checks to make sure our long_id actually produces a unique value