makefile tweaks

Conflicts:
	Makefile