Merge branch 'master' into 1320-local

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -89,7 +89,7 @@ Agda:
 
 Alloy:
   type: programming  # 'modeling' would be more appropiate
-  lexer: Text only
+  lexer: Alloy
   color: "#cc5c24"
   extensions:
   - .als
@@ -222,6 +222,8 @@ BlitzBasic:
   - .decls
 
 BlitzMax:
+  type: programming
+  color: "#cd6400"
   extensions:
   - .bmx
 
@@ -735,12 +737,14 @@ GLSL:
   - .glsl
   - .fp
   - .frag
+  - .frg
   - .fshader
   - .geom
   - .glslv
   - .gshader
   - .shader
   - .vert
+  - .vrx
   - .vshader
 
 Genshi:
@@ -798,6 +802,12 @@ Gosu:
   extensions:
   - .gs
 
+Grace:
+  type: programming
+  lexer: Text only
+  extensions:
+  - .grace
+
 Grammatical Framework:
   type: programming
   lexer: Haskell
@@ -1397,7 +1407,6 @@ Nimrod:
 
 Nit:
   type: programming
-  #lexer: Nit
   lexer: Text only
   color: "#0d8921"
   extensions:
@@ -1544,6 +1553,8 @@ PHP:
   - .phpt
   filenames:
   - Phakefile
+  interpreters:
+  - php
 
 Pan:
   type: programming