Data Stuff

Fixed some of the merging problems. There are still about 300 duplicated
agency ids that need to be merged or something due to slightly different
names.