Merge index.html and theme dir from gh-pages
Code cleanup.
Merge branch 'master' into gh-pages