Improve contact merge

What's not really all that obvious in the file diffs (unless you look at just the first commit) is that there are more fields checked, the first and last donation dates are calculated, as well as the donation totals.