Adding QMake (Make-like) language.

Mostly because the file extension conflicts with that of Prolog.
Merge branch 'master' into 820-local

Conflicts:
	lib/linguist/samples.json
Merge pull request #1295 from github/820-local

820 local