forgot metatheory/Holmakefile
Merge remote-tracking branch 'origin/master' into cenv_close

Conflicts:
	metatheory/Holmakefile