Merge branch 'master' into clarion

grammars.yml

@@ -26,6 +26,9 @@ vendor/grammars/Alloy.tmbundle:
 - source.alloy
 vendor/grammars/AutoHotkey/:
 - source.ahk
+vendor/grammars/BrightScript.tmbundle/:
+- source.brightauthorproject
+- source.brightscript
 vendor/grammars/CLIPS-sublime:
 - source.clips
 vendor/grammars/ColdFusion:
@@ -60,6 +63,8 @@ vendor/grammars/JSyntax/:
 - source.j
 vendor/grammars/Julia.tmbundle:
 - source.julia
+vendor/grammars/Lean.tmbundle:
+- source.lean
 vendor/grammars/LiveScript.tmbundle:
 - source.livescript
 vendor/grammars/Modelica/:
@@ -88,6 +93,8 @@ vendor/grammars/Slash.tmbundle:
 vendor/grammars/Stata.tmbundle:
 - source.mata
 - source.stata
+vendor/grammars/Stylus/:
+- source.stylus
 vendor/grammars/Sublime-Coq:
 - source.coq
 vendor/grammars/Sublime-HTTP:
@@ -106,6 +113,8 @@ vendor/grammars/Sublime-QML:
 - source.qml
 vendor/grammars/Sublime-REBOL:
 - source.rebol
+vendor/grammars/Sublime-Red:
+- source.red
 vendor/grammars/Sublime-SQF-Language:
 - source.sqf
 vendor/grammars/Sublime-Text-2-OpenEdge-ABL:
@@ -138,6 +147,8 @@ vendor/grammars/actionscript3-tmbundle:
 - text.xml.flex-config
 vendor/grammars/ada.tmbundle:
 - source.ada
+vendor/grammars/ampl:
+- source.ampl
 vendor/grammars/ant.tmbundle:
 - text.xml.ant
 vendor/grammars/antlr.tmbundle:
@@ -147,6 +158,8 @@ vendor/grammars/apache.tmbundle:
 - source.apache-config.mod_perl
 vendor/grammars/applescript.tmbundle:
 - source.applescript
+vendor/grammars/asciidoc.tmbundle/:
+- text.html.asciidoc
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
@@ -284,6 +297,8 @@ vendor/grammars/javadoc.tmbundle:
 - text.html.javadoc
 vendor/grammars/javascript-objective-j.tmbundle:
 - source.js.objj
+vendor/grammars/jflex.tmbundle:
+- source.jflex
 vendor/grammars/jquery-tmbundle:
 - source.js.jquery
 vendor/grammars/json.tmbundle:
@@ -376,12 +391,17 @@ vendor/grammars/ooc.tmbundle:
 - source.ooc
 vendor/grammars/opa.tmbundle:
 - source.opa
+vendor/grammars/openscad.tmbundle/:
+- source.scad
+vendor/grammars/oracle.tmbundle:
+- source.plsql.oracle
 vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
 vendor/grammars/pascal.tmbundle:
 - source.pascal
-vendor/grammars/perl.tmbundle:
+vendor/grammars/perl.tmbundle/:
 - source.perl
+- source.perl.6
 vendor/grammars/php-smarty.tmbundle:
 - source.smarty
 vendor/grammars/php.tmbundle:
@@ -461,6 +481,9 @@ vendor/grammars/sublime-idris:
 - source.idris
 vendor/grammars/sublime-mask:
 - source.mask
+vendor/grammars/sublime-netlinx:
+- source.netlinx
+- source.netlinx.erb
 vendor/grammars/sublime-nginx:
 - source.nginx
 vendor/grammars/sublime-nix:
@@ -481,9 +504,14 @@ vendor/grammars/sublime-tea:
 - source.tea
 vendor/grammars/sublime-text-ox/:
 - source.ox
+vendor/grammars/sublime-text-pig-latin/:
+- source.pig_latin
+vendor/grammars/sublime-varnish:
+- source.varnish.vcl
 vendor/grammars/sublime_cobol:
 - source.acucobol
 - source.cobol
+- source.jcl
 - source.opencobol
 vendor/grammars/sublime_man_page_support:
 - source.man
@@ -513,6 +541,8 @@ vendor/grammars/verilog.tmbundle:
 - source.verilog
 vendor/grammars/x86-assembly-textmate-bundle:
 - source.asm.x86
+vendor/grammars/xc.tmbundle/:
+- source.xc
 vendor/grammars/xml.tmbundle:
 - text.xml
 - text.xml.xsl