Update Makefile and turn directives into html comments, not mustache