more tests, bootstrap fixes, partition-folding
Merge branch 'phylogeny' of https://github.com/benedictpaten/pinchesAndCacti into phylogeny

Conflicts:
	impl/stPinchPhylogeny.c
	tests/stPinchPhylogenyTests.c