trying to get style and js paths working for github.io
Merge branch 'master' into gh-pages