Merge branch 'master' into return-nil-on-no-ace-mode

lib/linguist/heuristics.rb

@@ -129,7 +129,7 @@ module Linguist
     disambiguate "FORTRAN", "Forth" do |data|
       if /^: /.match(data)
         Language["Forth"]
-      elsif /^([c*][^a-z]|      subroutine\s)/i.match(data)
+      elsif /^([c*][^a-z]|      (subroutine|program)\s|!)/i.match(data)
         Language["FORTRAN"]
       end
     end

lib/linguist/languages.yml

@@ -2274,6 +2274,14 @@ Protocol Buffer:
   tm_scope: source.protobuf
   ace_mode: protobuf
 
+Public Key:
+  type: data
+  extensions:
+  - .asc
+  - .pub
+  tm_scope: none
+  ace_mode: none
+
 Puppet:
   type: programming
   color: "#cc5555"

lib/linguist/vendor.yml

@@ -32,6 +32,7 @@
 
 # Erlang bundles
 - ^rebar$
+- erlang.mk
 
 # Go dependencies
 - Godeps/_workspace/