Fixed TrialDefinition persistence. Made references to clusterFactors private in TrialDefinition - this had no effect.  This is an unimplemented feature. General Code Fixery.