VCF to Adam mega merge commit

Fix some bad merges
Merge branch 'adam-vcf' of https://github.com/nealsid/adam into adam-vcf

Conflicts:
	adam-core/src/main/scala/edu/berkeley/cs/amplab/adam/rdd/AdamContext.scala