Merge branch 'master' into cut-release-v4.2.0

Conflicts:
	grammars.yml

lib/linguist/heuristics.rb

@@ -70,8 +70,10 @@ module Linguist
       end
     end
 
-    disambiguate "Perl", "Prolog" do |data|
-      if data.include?("use strict")
+    disambiguate "Perl", "Perl6", "Prolog" do |data|
+      if data.include?("use v6")
+        Language["Perl6"]
+      elsif data.include?("use strict")
         Language["Perl"]
       elsif data.include?(":-")
         Language["Prolog"]
@@ -144,6 +146,15 @@ module Linguist
 
     disambiguate "Gosu", "JavaScript" do |data|
       Language["Gosu"] if /^uses java\./.match(data)
-    end    
+    end
+
+    disambiguate "LoomScript", "LiveScript" do |data|
+      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
+        Language["LoomScript"]
+      else
+        Language["LiveScript"]
+      end
+    end
+
   end
 end

lib/linguist/languages.yml

@@ -1492,6 +1492,12 @@ LookML:
   - .lookml
   tm_scope: source.yaml
 
+LoomScript:
+  type: programming
+  extensions:
+  - .ls
+  tm_scope: source.loomscript
+
 Lua:
   type: programming
   ace_mode: lua
@@ -1971,14 +1977,17 @@ Perl6:
   type: programming
   color: "#0298c3"
   extensions:
-  - .p6
   - .6pl
   - .6pm
   - .nqp
+  - .p6
   - .p6l
   - .p6m
+  - .pl
   - .pl6
+  - .pm
   - .pm6
+  - .t
   interpreters:
   - perl6
   tm_scope: none