Merge gh-pages version of index back to master