Updating Obj C++ PR so that it merges cleanly

See https://github.com/github/linguist/pull/411 for original PR.

/ cc @josharian