Clean up the ggplot2 demo of using custom qualitative colour scheme; remove the head to head comparison of ggplot2 and lattice to put in its own block