htslib/vcf.[hc]: Keep ID separately from the alleles block. Renamed synced_bcf_reader
data structures and functions.
Added faidx into htslib
Merge branch 'develop' of git://github.com/samtools/htslib into develop

Conflicts:
	vcfcheck.c