Add missing "class" keyword
Remove color diagnostics and c++11 definitions
Merge remote-tracking branch 'origin/master'