updated cohort analysis recipe - still more to update...
merged conflicting branches