Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
Merge pull request #3032 from tianon/makefile-tweaks

Tweak Makefile for consistency and Ctrl+C-ability