Build on OSX and Linux
Fix a compiler warning on Linux
Merge pull request #1 from scottferg/master

Build on OSX as well as Linux (and anything else)