makefile support for linux and OSX - clear
removed machine_name options
Merge branch 'marco' into next

Conflicts:
	c_driver/baseline.sum.map
	c_driver/makefile
	src/supportfiles.c