Slight Makefile cleanup
We really should use CXXFLAGS and CXX instead of CFLAGS and CC, and
we don't really want to force the use of g++. Hence I changed the
variable names and removed setting g++ as the compiler. I want to
easily compile this with clang++ without modifying the file.