Merge the two python programs

This does all the downloading and merging at once. It also merges data as it is downloaded so that the data files are no-longer necessary.