Use meld for diffs.
Use C++11 for YCM.