cnn benchmark generates fuller plot data

Number of epochs is computed such that approximately the same number of
iterations are run regardless of batch size.

Added two ways of looking at time for plotting, real time and
iteration-count time. Made some tweaking to handel the fuller data now
generated by the Generate-script.