The Makefile is now OSX and Linux aware
Merge pull request #379 from olasundell/master

The Makefile is now OSX and Linux aware