Merge branch 'master' into gh-pages
Bringing back quotes around file paths to fix firefox bug
Merge branch 'gh-pages'