FOUC fix... i think. browser caching erghs
Merge branch 'andrew' into gh-pages