Revert combine_variant_files back to GATK instead of vcflib vcfintersect. vcfintersect not correctly handling many merge cases. Fixes #338. Fixes #339. Fixes #343