Clean up some data processing code
Alter join to avoid duplicate columns

Not sure if dplyr or plyr have changed