Got rid of the c++11 stuffs
Merge branch 'riddance'