Switch to c++11 from c++1y