Update Makefile to allow override of C++11 flag

Also a rename of c++0x -> c++11 in the comments