Fixed color pallet with help from https://kuler.adobe.com/explore/most-popular/?time=all
Merge branch 'master' into gh-pages