made the Makefile slightly more generic
Merge pull request #2 from haxwithaxe/master

Makefile changes