Remove (redundant) Makefile
Merge branch 'master' into gh-pages