Finishes broken upload started in changeset/162829402

Broken import because of conflicts, finished in changeset/162829402

It didn't make a changeset the size of the wabash river's entire relation! that's good!