Update with some schema changes that were lost in the merge
Undo extra changes
Undo extra changes
Undo extra changes
Undo extra changes
Undo extra changes
Sites-only VCF writing
Add genotype metadata to ADAM->VCF conversion
Ensure VCF header is written out and enhance ADAM->GATK conversion of FORMAT fields
Merge remote-tracking branch 'neal/adam-vcf' into adam-vcf

Conflicts:
	adam-core/src/main/scala/edu/berkeley/cs/amplab/adam/converters/VariantContextConverter.scala
	adam-core/src/test/scala/edu/berkeley/cs/amplab/adam/converters/VariantContextConverterSuite.scala
	adam-core/src/test/scala/edu/berkeley/cs/amplab/adam/rdd/variation/ADAMVariationContextSuite.scala