Remove forced C++11, make into CXX11 option