Merge branch 'pr/750' into perl_6

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -1206,16 +1206,30 @@ Perl:
   primary_extension: .pl
   extensions:
   - .PL
-  - .nqp
   - .perl
   - .ph
   - .plx
-  - .pm6
+  - .pm
   - .pod
   - .psgi
   interpreters:
   - perl
 
+Perl6:
+  type: programming
+  color: "#0298c3"
+  primary_extension: .p6
+  extensions:
+  - .6pl
+  - .6pm
+  - .nqp
+  - .p6l
+  - .p6m
+  - .pl
+  - .pl6
+  - .pm
+  - .pm6
+
 Pike:
   type: programming
   color: "#066ab2"