Revert Makefile to last working version, and make clean now deletes version.h 

Reverted Makefile to 23e6eb34ec 
Also added "make clean deletes verison.h, if it exists"