OS X build update
Makefile 'fixes'.
Merge pull request #7 from penguinflyer5234/osx-build

OS X and Linux build updates
Convert to C++