cleaning up the mess. gh-pages branch was merged with master