Add dropdowns for scatterplot interactivity
Redraw scatterplot when axes or area dimension change
Refactor to return field names/descriptions from color service
Refactor sector filter to match other fields
Move color-related things from map service to color service
Move CSS color/size ramp definitions to app constant
Use all energy fields for scatterplot x, y, and size dimensions
Refactor column name fetch from map color service for scatterplot
Set color values for scatterplot
Refactor color service out of mapping module
Fix tests
Set scatterplot radius to zero when x or y val is < 1
Merge branch 'feature/scatterplot-interactivity' into develop

Conflicts:
	app/scripts/charting/scatterplot-directive.js
	app/scripts/views/map/map-controller.js
	test/spec/colors/colors-service.spec.js