Fix bug where scatterplot stopped working when n=1.
Merge branch 'master' into gh-pages
grunt