Merge changes from gh-pages
Merge branch 'gh-pages'
Don't need index page in master branch