changed internal workings of merge_duplicate_variants to khash.  Minor tweaks to other source files.