Fix the SimpleScatteredPlot example to demonstrate / test modified histogram use (mistake from previous commit)
Merge commit '297abb9c87ebf309514e2211ac56102b353fb3e0'

* commit '297abb9c87ebf309514e2211ac56102b353fb3e0':
  Cache the size of the plot area as NSDecimal values to speed up coordinate space conversion. Fixed issue #105.
Merge branch 'master' into release-2.0

* master:
  Fix the SimpleScatteredPlot example to demonstrate / test modified histogram use (mistake from previous commit)

Conflicts:
	examples/CorePlotGallery/src/plots/SimpleScatterPlot.m
Add options for CPTScatteredPlotInterpolationHistogram that allow skipping the first or second step in the histogram. This allows creation of a scattered line graph that combines linear and histogram styles.

Modified the SimpleScatteredPlot example to demonstrate / test modified histogram use
Cleanup histogram option naming and add setter in style with other options so changing value causes graph to be updated in view.
Update sample to reflect changes to API and add handling of a press/click in plot area to toggle between the histogram options plus linear views to show the differences.
update CPTScatterPlotHistogramOption property definition to match that for CPTScatterPlotInterpolation
Added histogram style options to CPTScatterPlot.
Added the histogram option setting to the initializers.
Added documentation comments for the histogram options.
Changed the default plot style in the Simple Scatter Plot demo back to "linear".