xy-plot and time-series-plot modified to take into account group-by names correctly for legend labels. Fixes incanter/incanter#216