Change to more general way of creating unique column names in join
Initial implementation of metadata merging
Use a mapping from new col names back to originals in join