Various bugfixes, improvements to output from generator, tests fixed.

Fixed function combination issue which caused too few data points to be combined due to double overprecision.
PMF estimator no longer normalises things twice.
Generator error checking, removed the need to generate raw data files before generating streams.