Merge branches, delete gh-pages