renamed renderer -> plot in css
cicle-plot => scatter-plot
Merge branch 'master' into css-plot

Conflicts:
	plottable.js
Merge pull request #768 from palantir/css-plot

renamed renderer -> plot in css