Merge branch 'master' into 1364-local

Conflicts:
	lib/linguist/languages.yml

lib/linguist/languages.yml

@@ -260,6 +260,7 @@ C:
   extensions:
   - .c
   - .cats
+  - .h
   - .w
 
 C#:
@@ -288,6 +289,7 @@ C++:
   - .cc
   - .cxx
   - .H
+  - .h
   - .h++
   - .hh
   - .hpp
@@ -321,7 +323,7 @@ CLIPS:
 CMake:
   extensions:
   - .cmake
-  - .cmake.in
+  - .in
   filenames:
   - CMakeLists.txt
 
@@ -380,7 +382,7 @@ Clojure:
   - .cljscm
   - .cljx
   - .hic
-  - .cljs.hl
+  - .hl
   filenames:
   - riemann.config
 
@@ -444,6 +446,7 @@ Coq:
   type: programming
   extensions:
   - .coq
+  - .v
 
 Cpp-ObjDump:
   type: data
@@ -479,6 +482,12 @@ Cuda:
   - .cu
   - .cuh
 
+Cycript:
+  type: programming
+  lexer: JavaScript
+  extensions:
+  - .cy
+
 Cython:
   type: programming
   group: Python
@@ -533,6 +542,7 @@ Dart:
 Diff:
   extensions:
   - .diff
+  - .patch
 
 Dogescript:
   type: programming
@@ -617,6 +627,7 @@ Erlang:
   color: "#0faf8d"
   extensions:
   - .erl
+  - .escript
   - .hrl
 
 F#:
@@ -692,6 +703,7 @@ Forth:
   extensions:
   - .fth
   - .4th
+  - .forth
 
 Frege:
   type: programming
@@ -800,6 +812,9 @@ Gosu:
   color: "#82937f"
   extensions:
   - .gs
+  - .gst
+  - .gsx
+  - .vark
 
 Grace:
   type: programming
@@ -835,6 +850,7 @@ Groovy:
   color: "#e69f56"
   extensions:
   - .groovy
+  - .gradle
   - .grt
   - .gtpl
   - .gvy
@@ -857,7 +873,6 @@ HTML:
   extensions:
   - .html
   - .htm
-  - .html.hl
   - .st
   - .xhtml
 
@@ -877,9 +892,7 @@ HTML+ERB:
   - erb
   extensions:
   - .erb
-  - .erb.deface
-  - .html.erb
-  - .html.erb.deface
+  - .deface
 
 HTML+PHP:
   type: markup
@@ -897,17 +910,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
@@ -945,6 +955,7 @@ IDL:
   color: "#e3592c"
   extensions:
   - .pro
+  - .dlm
 
 INI:
   type: data
@@ -1019,6 +1030,7 @@ JSON:
   searchable: false
   extensions:
   - .json
+  - .lock
   - .sublime-keymap
   - .sublime-mousemap
   - .sublime-project
@@ -1147,6 +1159,9 @@ Lasso:
   color: "#2584c3"
   extensions:
   - .lasso
+  - .las
+  - .lasso9
+  - .ldml
 
 Latte:
   type: markup
@@ -1232,6 +1247,7 @@ Lua:
   extensions:
   - .lua
   - .nse
+  - .pd_lua
   - .rbxs
   interpreters:
   - lua
@@ -1345,7 +1361,7 @@ MiniD: # Legacy
 Mirah:
   type: programming
   lexer: Ruby
-  search_term: ruby
+  search_term: mirah
   color: "#c7a938"
   extensions:
   - .druby
@@ -1377,6 +1393,7 @@ Myghty:
 NSIS:
   extensions:
   - .nsi
+  - .nsh
 
 Nemerle:
   type: programming
@@ -1441,6 +1458,7 @@ OCaml:
   color: "#3be133"
   extensions:
   - .ml
+  - .eliom
   - .eliomi
   - .ml4
   - .mli
@@ -1461,6 +1479,7 @@ Objective-C:
   - objc
   extensions:
   - .m
+  - .h
 
 Objective-C++:
   type: programming
@@ -1508,6 +1527,7 @@ OpenEdge ABL:
   - abl
   extensions:
   - .p
+  - .cls
 
 Org:
   type: prose
@@ -1546,6 +1566,7 @@ PHP:
   - .php
   - .aw
   - .ctp
+  - .module
   - .php3
   - .php4
   - .php5
@@ -1594,6 +1615,7 @@ Pascal:
   extensions:
   - .pas
   - .dfm
+  - .dpr
   - .lpr
 
 Perl:
@@ -1604,6 +1626,7 @@ Perl:
   - .pl
   - .PL
   - .cgi
+  - .fcgi
   - .perl
   - .ph
   - .plx
@@ -1819,6 +1842,7 @@ Racket:
   - .rkt
   - .rktd
   - .rktl
+  - .scrbl
 
 Ragel in Ruby Host:
   type: programming
@@ -1888,7 +1912,10 @@ Ruby:
   - .god
   - .irbrc
   - .mspec
+  - .pluginspec
   - .podspec
+  - .rabl
+  - .rake
   - .rbuild
   - .rbw
   - .rbx
@@ -1962,6 +1989,7 @@ Sass:
   group: CSS
   extensions:
   - .sass
+  - .scss
 
 Scala:
   type: programming
@@ -1969,6 +1997,7 @@ Scala:
   color: "#7dd3b0"
   extensions:
   - .scala
+  - .sbt
   - .sc
 
 Scaml:
@@ -1984,6 +2013,7 @@ Scheme:
   - .scm
   - .sld
   - .sls
+  - .sps
   - .ss
   interpreters:
   - guile
@@ -1995,6 +2025,8 @@ Scilab:
   type: programming
   extensions:
   - .sci
+  - .sce
+  - .tst
 
 Self:
   type: programming
@@ -2014,8 +2046,10 @@ Shell:
   - zsh
   extensions:
   - .sh
+  - .bash
   - .bats
   - .tmux
+  - .zsh
   interpreters:
   - bash
   - sh
@@ -2082,6 +2116,7 @@ Standard ML:
   extensions:
   - .ML
   - .fun
+  - .sig
   - .sml
 
 Stata:
@@ -2282,6 +2317,7 @@ Visual Basic:
   extensions:
   - .vb
   - .bas
+  - .cls
   - .frm
   - .frx
   - .vba
@@ -2310,6 +2346,7 @@ XML:
   - wsdl
   extensions:
   - .xml
+  - .ant
   - .axml
   - .ccxml
   - .clixml
@@ -2323,6 +2360,7 @@ XML:
   - .fsproj
   - .glade
   - .grxml
+  - .ivy
   - .jelly
   - .kml
   - .launch