Handle new C++ and Objective-C++ scope names
Merge pull request #65 from atom/mb-new-cpp-scope-names

Handle new C++ and Objective-C++ scope names