Merge branch 'master' into 1132-local

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -157,6 +157,7 @@ Assembly:
   - nasm
   extensions:
   - .asm
+  - .inc
 
 Augeas:
   type: programming
@@ -998,6 +999,13 @@ Ioke:
   extensions:
   - .ik
 
+Isabelle:
+  type: programming
+  lexer: Text only
+  color: "#fdcd00"
+  extensions:
+  - .thy
+
 J:
   type: programming
   lexer: Text only
@@ -2288,6 +2296,7 @@ XML:
   - .launch
   - .mxml
   - .nproj
+  - .nuspec
   - .osm
   - .plist
   - .pluginspec
@@ -2359,6 +2368,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:

lib/linguist/vendor.yml

@@ -204,3 +204,7 @@
 - ^vignettes/
 - ^inst/extdata/
 
+# Octicons
+- octicons.css
+- octicons.min.css
+- sprockets-octicons.scss