A C++ shibboleth?
Merge branch 'master' into cpp_heuristic

Conflicts:
	lib/linguist/samples.json
Regenerating samples.json and bringing C++ heuristic test up to date
Merge pull request #850 from github/cpp_heuristic

A C++ shibboleth?