Changed Makefile to g++ for now until I can get clang working