Didn't mean to put this in master
Merge branch 'master' into gh-pages
Add back index.html