Update Makefile to work on both Linux and OSX