Merge branch 'master' into development

src/models/scatter.js

@@ -62,12 +62,10 @@ nv.models.scatter = function() {
           container = d3.select(this);
 
       //add series index to each data point for reference
-      data = data.map(function(series, i) {
+      data.forEach(function(series, i) {
-        series.values = series.values.map(function(point) {
+        series.values.forEach(function(point) {
           point.series = i;
-          return point;
         });
-        return series;
       });
 
       //------------------------------------------------------------