merged zkasmi/makefile_fixes to makefile_windows_fixes

Conflicts:
	Makefile.include