Merge branch 'master' into 1233-local

Conflicts:
	lib/linguist/language.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json

samples/Puppet/stages-example.pp

@@ -0,0 +1,26 @@
+class foo {
+  notify {
+    "foo": ;
+  }
+}
+
+class bar {
+  notify {
+    "bar": ;
+  }
+}
+
+
+node default {
+  stage {
+    "one": ;
+    "two": ;
+  }
+
+  class {
+    "foo": stage => "one";
+    "bar": stage => "two";
+  }
+
+  Stage["one"] -> Stage["two"]
+}