Secondary contact and local adaptation contribute to genome-wide patterns of clinal variation in Drosophila melanogaster