Merge branch 'gh-pages'
replace instances of px fallbacks with include
Merge branch 'master' into gh-pages