Make config.json into config.example.json also
Merge branch 'master' into gh-pages