Backport makefile enhancements
Merge pull request #16 from hadleyrich/master

Backport makefile enhancements