Merge pull request #2 from puppetlabs/master

merge upstream

Author: b4ldr

.fixtures.yml

@@ -1,3 +1,4 @@
 fixtures:
   symlinks:
     stdlib: "#{source_dir}"
+    test:   "#{source_dir}/spec/fixtures/test"

.gitattributes

@@ -0,0 +1,5 @@
+#This file is generated by ModuleSync, do not edit.
+*.rb eol=lf
+*.erb eol=lf
+*.pp eol=lf
+*.sh eol=lf

.gitignore

@@ -1,10 +1,27 @@
+#This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
+Gemfile.local
 vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
+log/
+junit/
 .vagrant/
 .bundle/
 coverage/
 log/
 .idea/
+.metadata
 *.iml
+.*.sw[op]
+.yardoc
+.yardwarns
+.DS_Store
+tmp/
+vendor/
+doc/
+
+!spec/fixtures/
+spec/fixtures/manifests/site.pp
+spec/fixtures/modules/*

.project

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>stdlib</name>
+	<name>puppetlabs-stdlib</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -17,7 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>