Updating with new variant/genotype implementations from Adam PR #13.