Merge pull request #25 from wrouesnel/tweak-makefile-for-osx

Make the makefile less Linux specific