Merge branch 'master' into 1267-local

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -28,6 +28,16 @@ ABAP:
   extensions:
   - .abap
 
+AGS Script:
+  type: programming
+  lexer: C++
+  color: "#B9D9FF"
+  aliases:
+  - ags
+  extensions:
+  - .asc
+  - .ash
+
 ANTLR:
   type: programming
   color: "#9DC3FF"
@@ -35,6 +45,12 @@ ANTLR:
   extensions:
   - .g4
 
+APL:
+  type: programming
+  color: "#8a0707"
+  extensions:
+  - .apl
+
 ASP:
   type: programming
   color: "#6a40fd"
@@ -89,7 +105,7 @@ Agda:
 
 Alloy:
   type: programming  # 'modeling' would be more appropiate
-  lexer: Text only
+  lexer: Alloy
   color: "#cc5c24"
   extensions:
   - .als
@@ -103,7 +119,7 @@ ApacheConf:
 
 Apex:
   type: programming
-  lexer: Text only
+  lexer: Java
   extensions:
   - .cls
 
@@ -221,6 +237,8 @@ BlitzBasic:
   - .decls
 
 BlitzMax:
+  type: programming
+  color: "#cd6400"
   extensions:
   - .bmx
 
@@ -258,13 +276,14 @@ C:
   extensions:
   - .c
   - .cats
+  - .h
   - .w
 
 C#:
   type: programming
   ace_mode: csharp
   search_term: csharp
-  color: "#5a25a2"
+  color: "#178600"
   aliases:
   - csharp
   extensions:
@@ -286,6 +305,7 @@ C++:
   - .cc
   - .cxx
   - .H
+  - .h
   - .h++
   - .hh
   - .hpp
@@ -319,7 +339,7 @@ CLIPS:
 CMake:
   extensions:
   - .cmake
-  - .cmake.in
+  - .in
   filenames:
   - CMakeLists.txt
 
@@ -344,6 +364,14 @@ Ceylon:
   extensions:
   - .ceylon
 
+Chapel:
+  type: programming
+  color: "#8dc63f"
+  aliases:
+  - chpl
+  extensions:
+  - .chpl
+
 ChucK:
   lexer: Java
   extensions:
@@ -352,9 +380,8 @@ ChucK:
 Cirru:
   type: programming
   color: "#aaaaff"
-  # ace_mode: cirru
-  # lexer: Cirru
-  lexer: Text only
+  ace_mode: cirru
+  lexer: Cirru
   extensions:
   - .cirru
 
@@ -378,7 +405,7 @@ Clojure:
   - .cljscm
   - .cljx
   - .hic
-  - .cljs.hl
+  - .hl
   filenames:
   - riemann.config
 
@@ -401,14 +428,27 @@ CoffeeScript:
 
 ColdFusion:
   type: programming
+  group: ColdFusion
   lexer: Coldfusion HTML
   ace_mode: coldfusion
   color: "#ed2cd6"
   search_term: cfm
   aliases:
   - cfm
+  - cfml
   extensions:
   - .cfm
+
+ColdFusion CFC:
+  type: programming
+  group: ColdFusion
+  lexer: Coldfusion CFC
+  ace_mode: coldfusion
+  color: "#ed2cd6"
+  search_term: cfc
+  aliases:
+  - cfc
+  extensions:
   - .cfc
 
 Common Lisp:
@@ -442,6 +482,7 @@ Coq:
   type: programming
   extensions:
   - .coq
+  - .v
 
 Cpp-ObjDump:
   type: data
@@ -477,6 +518,12 @@ Cuda:
   - .cu
   - .cuh
 
+Cycript:
+  type: programming
+  lexer: JavaScript
+  extensions:
+  - .cy
+
 Cython:
   type: programming
   group: Python
@@ -528,18 +575,10 @@ Dart:
   extensions:
   - .dart
 
-DCPU-16 ASM:
-  type: programming
-  lexer: dasm16
-  extensions:
-  - .dasm16
-  - .dasm
-  aliases:
-  - dasm16
-
 Diff:
   extensions:
   - .diff
+  - .patch
 
 Dogescript:
   type: programming
@@ -588,7 +627,7 @@ Eagle:
 
 Eiffel:
   type: programming
-  lexer: Text only
+  lexer: Eiffel
   color: "#946d57"
   extensions:
   - .e
@@ -608,7 +647,7 @@ Elm:
 
 Emacs Lisp:
   type: programming
-  lexer: Scheme
+  lexer: Common Lisp
   color: "#c065db"
   aliases:
   - elisp
@@ -619,11 +658,20 @@ Emacs Lisp:
   - .el
   - .emacs
 
+EmberScript:
+  type: programming
+  color: "#f64e3e"
+  lexer: CoffeeScript
+  extensions:
+  - .em
+  - .emberscript
+
 Erlang:
   type: programming
   color: "#0faf8d"
   extensions:
   - .erl
+  - .escript
   - .hrl
 
 F#:
@@ -699,6 +747,7 @@ Forth:
   extensions:
   - .fth
   - .4th
+  - .forth
 
 Frege:
   type: programming
@@ -707,6 +756,14 @@ Frege:
   extensions:
   - .fr
 
+G-code:
+  type: data
+  lexer: Text only
+  extensions:
+  - .g
+  - .gco
+  - .gcode
+
 Game Maker Language:
   type: programming
   color: "#8ad353"
@@ -736,6 +793,12 @@ GAS:
   - .s
   - .S
 
+GDScript:
+  type: programming
+  lexer: Text only
+  extensions:
+  - .gd
+
 GLSL:
   group: C
   type: programming
@@ -743,12 +806,14 @@ GLSL:
   - .glsl
   - .fp
   - .frag
+  - .frg
   - .fshader
   - .geom
   - .glslv
   - .gshader
   - .shader
   - .vert
+  - .vrx
   - .vshader
 
 Genshi:
@@ -805,6 +870,15 @@ Gosu:
   color: "#82937f"
   extensions:
   - .gs
+  - .gst
+  - .gsx
+  - .vark
+
+Grace:
+  type: programming
+  lexer: Text only
+  extensions:
+  - .grace
 
 Grammatical Framework:
   type: programming
@@ -834,6 +908,7 @@ Groovy:
   color: "#e69f56"
   extensions:
   - .groovy
+  - .gradle
   - .grt
   - .gtpl
   - .gvy
@@ -856,7 +931,6 @@ HTML:
   extensions:
   - .html
   - .htm
-  - .html.hl
   - .st
   - .xhtml
 
@@ -876,9 +950,7 @@ HTML+ERB:
   - erb
   extensions:
   - .erb
-  - .erb.deface
-  - .html.erb
-  - .html.erb.deface
+  - .deface
 
 HTML+PHP:
   type: markup
@@ -896,17 +968,14 @@ Haml:
   type: markup
   extensions:
   - .haml
-  - .haml.deface
-  - .html.haml.deface
+  - .deface
 
 Handlebars:
   type: markup
-  lexer: Text only
+  lexer: Handlebars
   extensions:
   - .handlebars
   - .hbs
-  - .html.handlebars
-  - .html.hbs
 
 Harbour:
   type: programming
@@ -932,7 +1001,7 @@ Haxe:
 
 Hy:
   type: programming
-  lexer: Clojure
+  lexer: Hy
   ace_mode: clojure
   color: "#7891b1"
   extensions:
@@ -940,10 +1009,17 @@ Hy:
 
 IDL:
   type: programming
-  lexer: Text only
+  lexer: IDL
   color: "#e3592c"
   extensions:
   - .pro
+  - .dlm
+
+IGOR Pro:
+  type: programming
+  lexer: Igor
+  extensions:
+  - .ipf
 
 INI:
   type: data
@@ -959,14 +1035,14 @@ Inno Setup:
 
 Idris:
   type: programming
-  lexer: Text only
+  lexer: Idris
   extensions:
   - .idr
   - .lidr
 
 Inform 7:
   type: programming
-  lexer: Text only
+  lexer: Inform 7
   wrap: true
   extensions:
   - .ni
@@ -998,6 +1074,13 @@ Ioke:
   extensions:
   - .ik
 
+Isabelle:
+  type: programming
+  lexer: Text only
+  color: "#fdcd00"
+  extensions:
+  - .thy
+
 J:
   type: programming
   lexer: Text only
@@ -1011,6 +1094,7 @@ JSON:
   searchable: false
   extensions:
   - .json
+  - .lock
   - .sublime-keymap
   - .sublime-mousemap
   - .sublime-project
@@ -1079,6 +1163,7 @@ JavaScript:
   - .es6
   - .frag
   - .jake
+  - .jsb
   - .jsfl
   - .jsm
   - .jss
@@ -1087,6 +1172,8 @@ JavaScript:
   - .pac
   - .sjs
   - .ssjs
+  - .xsjs
+  - .xsjslib
   filenames:
   - Jakefile
   interpreters:
@@ -1131,12 +1218,31 @@ LLVM:
   extensions:
   - .ll
 
+LSL:
+  type: programming
+  lexer: LSL
+  ace_mode: lsl
+  extensions:
+  - .lsl
+  interpreters:
+  - lsl
+  color: '#3d9970'
+
+LabVIEW:
+  type: programming
+  lexer: Text only
+  extensions:
+  - .lvproj
+
 Lasso:
   type: programming
   lexer: Lasso
   color: "#2584c3"
   extensions:
   - .lasso
+  - .las
+  - .lasso9
+  - .ldml
 
 Latte:
   type: markup
@@ -1215,6 +1321,14 @@ Logtalk:
   - .lgt
   - .logtalk
 
+LookML:
+  type: programming
+  lexer: YAML
+  ace_mode: yaml
+  color: "#652B81"
+  extensions:
+  - .lookml
+
 Lua:
   type: programming
   ace_mode: lua
@@ -1222,6 +1336,7 @@ Lua:
   extensions:
   - .lua
   - .nse
+  - .pd_lua
   - .rbxs
   interpreters:
   - lua
@@ -1285,7 +1400,9 @@ Mathematica:
   type: programming
   extensions:
   - .mathematica
-  lexer: Text only
+  - .m
+  - .nb
+  lexer: Mathematica
 
 Matlab:
   type: programming
@@ -1333,7 +1450,7 @@ MiniD: # Legacy
 Mirah:
   type: programming
   lexer: Ruby
-  search_term: ruby
+  search_term: mirah
   color: "#c7a938"
   extensions:
   - .druby
@@ -1365,6 +1482,7 @@ Myghty:
 NSIS:
   extensions:
   - .nsi
+  - .nsh
 
 Nemerle:
   type: programming
@@ -1392,6 +1510,19 @@ Nimrod:
   - .nim
   - .nimrod
 
+Nit:
+  type: programming
+  lexer: Text only
+  color: "#0d8921"
+  extensions:
+  - .nit
+
+Nix:
+  type: programming
+  lexer: Nix
+  extensions:
+  - .nix
+
 Nu:
   type: programming
   lexer: Scheme
@@ -1416,6 +1547,7 @@ OCaml:
   color: "#3be133"
   extensions:
   - .ml
+  - .eliom
   - .eliomi
   - .ml4
   - .mli
@@ -1436,6 +1568,7 @@ Objective-C:
   - objc
   extensions:
   - .m
+  - .h
 
 Objective-C++:
   type: programming
@@ -1467,6 +1600,13 @@ Opa:
   extensions:
   - .opa
 
+Opal:
+  type: programming
+  color: "#f7ede0"
+  lexer: Text only
+  extensions:
+  - .opal
+
 OpenCL:
   type: programming
   group: C
@@ -1483,6 +1623,13 @@ OpenEdge ABL:
   - abl
   extensions:
   - .p
+  - .cls
+
+OpenSCAD:
+  type: programming
+  lexer: Text only
+  extensions:
+  - .scad
 
 Org:
   type: prose
@@ -1521,16 +1668,19 @@ PHP:
   - .php
   - .aw
   - .ctp
+  - .module
   - .php3
   - .php4
   - .php5
   - .phpt
   filenames:
   - Phakefile
+  interpreters:
+  - php
 
 Pan:
   type: programming
-  lexer: Text only
+  lexer: Pan
   color: '#cc0000'
   extensions:
   - .pan
@@ -1567,6 +1717,7 @@ Pascal:
   extensions:
   - .pas
   - .dfm
+  - .dpr
   - .lpr
   - .pp
 
@@ -1577,12 +1728,15 @@ Perl:
   extensions:
   - .pl
   - .PL
+  - .cgi
+  - .fcgi
   - .perl
   - .ph
   - .plx
   - .pm
   - .pod
   - .psgi
+  - .t
   interpreters:
   - perl
 
@@ -1599,10 +1753,17 @@ Perl6:
   - .pl6
   - .pm6
 
+PigLatin:
+  type: programming
+  color: "#fcd7de"
+  lexer: Text only
+  extensions:
+  - .pig
+
 Pike:
   type: programming
   color: "#066ab2"
-  lexer: C
+  lexer: Pike
   extensions:
   - .pike
   - .pmod
@@ -1647,11 +1808,12 @@ Processing:
 
 Prolog:
   type: programming
+  lexer: Logtalk
   color: "#74283c"
   extensions:
-  - .prolog
-  - .ecl
   - .pl
+  - .ecl
+  - .prolog
 
 Propeller Spin:
   type: programming
@@ -1696,9 +1858,11 @@ Python:
   color: "#3581ba"
   extensions:
   - .py
+  - .cgi
   - .gyp
   - .lmi
   - .pyde
+  - .pyp
   - .pyt
   - .pyw
   - .wsgi
@@ -1724,6 +1888,12 @@ QML:
   extensions:
   - .qml
 
+QMake:
+  lexer: Text only
+  extensions:
+  - .pro
+  - .pri
+
 R:
   type: programming
   color: "#198ce7"
@@ -1744,7 +1914,7 @@ R:
 
 RDoc:
   type: prose
-  lexer: Text only
+  lexer: Rd
   ace_mode: rdoc
   wrap: true
   extensions:
@@ -1784,6 +1954,7 @@ Racket:
   - .rkt
   - .rktd
   - .rktl
+  - .scrbl
 
 Ragel in Ruby Host:
   type: programming
@@ -1853,7 +2024,10 @@ Ruby:
   - .god
   - .irbrc
   - .mspec
+  - .pluginspec
   - .podspec
+  - .rabl
+  - .rake
   - .rbuild
   - .rbw
   - .rbx
@@ -1863,13 +2037,17 @@ Ruby:
   interpreters:
   - ruby
   filenames:
+  - .pryrc
   - Appraisals
   - Berksfile
   - Buildfile
   - Gemfile
   - Gemfile.lock
   - Guardfile
+  - Jarfile
+  - Mavenfile
   - Podfile
+  - Puppetfile
   - Thorfile
   - Vagrantfile
   - buildfile
@@ -1894,6 +2072,14 @@ SCSS:
   extensions:
   - .scss
 
+SQF:
+  type: programming
+  color: "#FFCB1F"
+  lexer: C++
+  extensions:
+  - .sqf
+  - .hqf
+
 SQL:
   type: data
   ace_mode: sql
@@ -1923,6 +2109,7 @@ Sass:
   group: CSS
   extensions:
   - .sass
+  - .scss
 
 Scala:
   type: programming
@@ -1930,6 +2117,7 @@ Scala:
   color: "#7dd3b0"
   extensions:
   - .scala
+  - .sbt
   - .sc
 
 Scaml:
@@ -1945,6 +2133,7 @@ Scheme:
   - .scm
   - .sld
   - .sls
+  - .sps
   - .ss
   interpreters:
   - guile
@@ -1956,6 +2145,8 @@ Scilab:
   type: programming
   extensions:
   - .sci
+  - .sce
+  - .tst
 
 Self:
   type: programming
@@ -1975,8 +2166,11 @@ Shell:
   - zsh
   extensions:
   - .sh
+  - .bash
   - .bats
+  - .cgi
   - .tmux
+  - .zsh
   interpreters:
   - bash
   - sh
@@ -2003,6 +2197,14 @@ Slash:
   extensions:
   - .sl
 
+Slim:
+  group: HTML
+  type: markup
+  lexer: Slim
+  color: "#ff8877"
+  extensions:
+  - .slim
+
 Smalltalk:
   type: programming
   color: "#596706"
@@ -2035,6 +2237,7 @@ Standard ML:
   extensions:
   - .ML
   - .fun
+  - .sig
   - .sml
 
 Stata:
@@ -2065,8 +2268,8 @@ SuperCollider:
 
 Swift:
   type: programming
+  lexer: Swift
   color: "#ffac45"
-  lexer: Text only
   extensions:
   - .swift
 
@@ -2115,10 +2318,13 @@ TeX:
   extensions:
   - .tex
   - .aux
+  - .bbx
   - .bib
+  - .cbx
   - .cls
   - .dtx
   - .ins
+  - .lbx
   - .ltx
   - .mkii
   - .mkiv
@@ -2235,6 +2441,7 @@ Visual Basic:
   extensions:
   - .vb
   - .bas
+  - .cls
   - .frm
   - .frx
   - .vba
@@ -2263,6 +2470,7 @@ XML:
   - wsdl
   extensions:
   - .xml
+  - .ant
   - .axml
   - .ccxml
   - .clixml
@@ -2276,11 +2484,13 @@ XML:
   - .fsproj
   - .glade
   - .grxml
+  - .ivy
   - .jelly
   - .kml
   - .launch
   - .mxml
   - .nproj
+  - .nuspec
   - .osm
   - .plist
   - .pluginspec
@@ -2352,6 +2562,17 @@ XSLT:
   - .xslt
   - .xsl
 
+Xojo:
+  type: programming
+  lexer: VB.net
+  extensions:
+  - .xojo_code
+  - .xojo_menu
+  - .xojo_report
+  - .xojo_script
+  - .xojo_toolbar
+  - .xojo_window
+
 Xtend:
   type: programming
   extensions: