fix problem with aclocal path that affected libtool
Merge branch 'master' of github.com:Macaulay2/M2

Conflicts:
	M2/Makefile
fix a file
change link order
my makefiles
Merge branch 'master' into export-strings-only
improve "make clean"