makefile improvements
Merge pull request #27 from ryancdotorg/new-makefile

makefile improvements