Merge branch 'master' of https://github.com/bigdatagenomics/adam into vcf-work-master-merge