Undo bad merge on my part
Merge variant schema code changes with BigDataGenomics master