fixed up some makefile things
Merge pull request #1 from Pat-Laub/master

fixed up some makefile things