cleaned up makefile
added CXXFLAGS as an environment variable to control build"
merge