Fixed errors with -g3 in Linux.
Fixed c++11 being put back in the cmake files.
Merge pull request #3 from hotblack17/UpdateMaster

Update master