Change title of doc page and simplify _config
Merge branch 'master' into gh-pages