Merging microsatellite data: enhanced methodology and software to combine genotype data for linkage and association analysis