Merge branch 'master' into 1036-local

README.md

@@ -108,6 +108,8 @@ See [Linguist::Generated#generated?](https://github.com/github/linguist/blob/mas
 
 Linguist supports custom overrides for language definitions and vendored paths. Add a `.gitattributes` file to your project using the keys `linguist-language` and `linguist-vendored` with the standard git-style path matchers for the files you want to override.
 
+Please note that the overrides currently only affect the language statistics for a repository and not the syntax-highlighting of files.
+
 ```
 $ cat .gitattributes
 *.rb linguist-language=Java

lib/linguist/languages.yml

@@ -962,7 +962,6 @@ Groovy:
   color: "#e69f56"
   extensions:
   - .groovy
-  - .gradle
   - .grt
   - .gtpl
   - .gvy
@@ -1001,7 +1000,7 @@ HTML+Django:
 
 HTML+ERB:
   type: markup
-  tm_scope: text.html.ruby
+  tm_scope: text.html.erb
   group: HTML
   lexer: RHTML
   aliases:
@@ -1571,6 +1570,8 @@ MoonScript:
   type: programming
   extensions:
   - .moon
+  interpreters:
+  - moon
 
 Myghty:
   extensions:

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "3.4.0"
+  VERSION = "3.4.1"
 end