Dev/bsilverman/review

Makefile fixes to work on Mac host.