Merge the Cohort and Cohort Allele Frequency concepts

Fix #87.