Merge branch 'master' into add-proximity-test

lib/linguist/languages.yml

@@ -28,6 +28,7 @@
 
 ABAP:
   type: programming
+  color: "#E8274B"
   extensions:
   - .abap
   ace_mode: abap
@@ -337,6 +338,7 @@ Boo:
 
 Brainfuck:
   type: programming
+  color: "#2F2530"
   extensions:
   - .b
   - .bf
@@ -643,6 +645,7 @@ Creole:
 
 Crystal:
   type: programming
+  color: "#76EEF5"
   extensions:
   - .cr
   ace_mode: ruby
@@ -869,6 +872,10 @@ Erlang:
   - .es
   - .escript
   - .hrl
+  filenames:
+  - rebar.config
+  - rebar.config.lock
+  - rebar.lock
   ace_mode: erlang
   interpreters:
   - escript
@@ -1564,6 +1571,7 @@ Kit:
 
 Kotlin:
   type: programming
+  color: "#EA4DFA"
   extensions:
   - .kt
   - .ktm
@@ -1781,6 +1789,7 @@ MUF:
 
 Makefile:
   type: programming
+  color: "#427819"
   aliases:
   - bsdmake
   - make
@@ -2930,6 +2939,7 @@ Shell:
   - .fcgi
   - .ksh
   - .tmux
+  - .tool
   - .zsh
   interpreters:
   - bash