Merge branch 'master' into memory_blob

grammars.yml

@@ -250,7 +250,6 @@ vendor/grammars/elixir-tmbundle:
 - source.elixir
 - text.elixir
 - text.html.elixir
-- text.html.eex
 vendor/grammars/erlang.tmbundle:
 - source.erlang
 - text.html.erlang.yaws

lib/linguist/languages.yml

@@ -1029,14 +1029,6 @@ Forth:
   - .fs
   ace_mode: forth
 
-Frege:
-  type: programming
-  color: "#00cafe"
-  extensions:
-  - .fr
-  tm_scope: source.haskell
-  ace_mode: haskell
-
 FreeMarker:
   type: programming
   color: "#0050b2"
@@ -1047,6 +1039,14 @@ FreeMarker:
   tm_scope: text.html.ftl
   ace_mode: ftl
 
+Frege:
+  type: programming
+  color: "#00cafe"
+  extensions:
+  - .fr
+  tm_scope: source.haskell
+  ace_mode: haskell
+
 G-code:
   type: data
   extensions:
@@ -1335,13 +1335,13 @@ HTML+Django:
 
 HTML+EEX:
   type: markup
-  tm_scope: text.html.eex
+  tm_scope: text.html.elixir
   group: HTML
   aliases:
   - eex
   extensions:
   - .eex
-  ace_mode: html_eex
+  ace_mode: text
 
 HTML+ERB:
   type: markup
@@ -1352,7 +1352,7 @@ HTML+ERB:
   extensions:
   - .erb
   - .erb.deface
-  ace_mode: html_ruby
+  ace_mode: text
 
 HTML+PHP:
   type: markup