Rename directory renames index file
Merge branch 'master' into newblog