More data!

Changed the sample generator so it can now generate up to 10,000,000
data points.
Merge remote-tracking branch 'origin/Work-in-Progress' into Work-in-Progress