Makefile: reset ^^^ before merge
added compress-sphinx-doc-website-with-jekyll-press

bug fix in Makefile: EDITOR