Sorted the factor levels in the order required in the legend to avoid problems...

Sorted the factor levels in the order required in the legend to avoid problems later. Reorganized ggplot calls.
1 job for develop-PlotForecastPDF
in 55 seconds, using 0 compute credits, and was queued for 1 second