Updated wm_core so that discrete plots now take their color value from wm_legend.py rather than generating colors itself. Colors for continuous data are still generated in wm_core for now. Reduced extra code in wm_legend.py.