Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
index.html
params.json
stylesheets/pygment_trac.css
stylesheets/stylesheet.css