BLD: spring cleaning on Makefile
Merge pull request #6784 from cpcloud/clean-up-makefile

BLD: spring cleaning on Makefile