Straightens out some renderCSS calls and cleans up CSS.
Merge branch 'master' into gh-pages