Merge in original likelihood calculation

Conflicts:
	src/cophy/model/ThresholdedCophylogenyModel.java