Merge branch 'phylogeny' into phylogenyGreedySplitAndRescue

Conflicts:
	caf/impl/phylogeny.c