Updated makefile to handle multiple OS's (OSX and not OSX)