This pull request solves issue #674, see it for details.
Adding QMake (Make-like) language.

Mostly because the file extension conflicts with that of Prolog.
update
add nix support
Merge branch 'master' into 1232-local

Conflicts:
	lib/linguist/samples.json
Explicit lexer
Merge pull request #1293 from github/1232-local

1232 local
Merge branch 'master' into 675-local

Conflicts:
	.gitignore
	lib/linguist/languages.yml
	lib/linguist/samples.json
Merge pull request #1294 from github/675-local

675 local
Merge branch 'master' into 820-local

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

820 local