Filler index html, general formatting/setting up.
Merge branch 'master' into gh-pages