Matching, Heterogeneity, and the Evolution of Income Distribution