Updating Makefile to allow overrides
Merge pull request #14 from jprjr/master

Update Makefile to allow overrides