Mega merge of vcf work into master

Hallelujah! Thank you, everyone!