Merge pull request #1034 from goorpy/master

Patch for colors array, issue #1031

jquery.flot.js

@@ -641,6 +641,12 @@ Licensed under the MIT license.
         function parseOptions(opts) {
 
             $.extend(true, options, opts);
+            
+            //Override options.colors after $.extend if user has set colors, because extend does not clear out excess
+            //default colors if user defines color palette smaller than default palette size (currently 5).
+            if (opts.colors) {
+            	options.colors = opts.colors;
+            }
 
             if (options.xaxis.color == null)
                 options.xaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();