Merge remote-tracking branch 'upstream/master' into wavefront

Resolves conflicts:
	.gitmodules

lib/linguist/languages.yml

@@ -722,6 +722,34 @@ Crystal:
   interpreters:
   - crystal
 
+Csound:
+  type: programming
+  aliases:
+  - csound-orc
+  extensions:
+  - .orc
+  - .udo
+  tm_scope: source.csound
+  ace_mode: text
+
+Csound Document:
+  type: programming
+  aliases:
+  - csound-csd
+  extensions:
+  - .csd
+  tm_scope: source.csound-document
+  ace_mode: text
+
+Csound Score:
+  type: programming
+  aliases:
+  - csound-sco
+  extensions:
+  - .sco
+  tm_scope: source.csound-score
+  ace_mode: text
+
 Cucumber:
   type: programming
   extensions:
@@ -1705,6 +1733,7 @@ Jade:
   type: markup
   extensions:
   - .jade
+  - .pug
   tm_scope: text.jade
   ace_mode: jade
 
@@ -2130,6 +2159,7 @@ Makefile:
   - Makefile.in
   - Makefile.inc
   - makefile
+  - makefile.sco
   - mkfile
   interpreters:
   - make