Getting things ready for C++11 and SDL2