Tone down the colors

Less of an olive, more of a light green now
Merge branch 'master' into gh-pages