Merge branch 'master' into 1049

Conflicts:
	lib/linguist/samples.json

lib/linguist/vendor.yml

@@ -10,7 +10,7 @@
 ## Vendor Conventions ##
 
 # Caches
-- cache/
+- (^|/)cache/
 
 # Dependencies
 - ^[Dd]ependencies/
@@ -98,6 +98,9 @@
 # AngularJS
 - (^|/)angular([^.]*)(\.min)?\.js$
 
+# React
+- (^|/)react(-[^.]*)?(\.min)?\.js$
+
 ## Python ##
 
 # django
@@ -128,6 +131,7 @@
 
 # Visual Studio IntelliSense
 - -vsdoc\.js$
+- \.intellisense\.js$
 
 # jQuery validation plugin (MS bundles this with asp.net mvc)
 - (^|/)jquery([^.]*)\.validate(\.unobtrusive)?(\.min)?\.js$