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.
Add misclassified Prolog samples

These two files are incorrectly classified as Perl.  They should be
classified as Prolog.  There are many distinctive tokens in each file
which clearly differentiate between Perl and Prolog.
Idris is upstream in Pygments now: https://bitbucket.org/birkenfeld/pygments-main/pull-request/210
update
added .pyp suffix and an example source file. closes issue #1
added two more common mathematica suffixes
Merge remote-tracking branch 'upstream/master'
added a sample package
added two notebook samples
Add Mavenfile and Jarfile as Ruby files.
Added generated rule for Zephir language
add nix support
Merge branch 'master' into 1132-local

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

1132 local
Reordering
Merge pull request #1290 from github/1258-local

1258 local
Samples
Merge branch 'master' into 997-local
Samples update