Cleanup Makefile, and it now removes *~ files