Merge pull request #285 from antonblanchard/Makefile-cleanup-2