Pulled in some changes from master, and made further changes.

nemonik · nemonik · commit e80e83bd39ce · 2015-05-16T02:02:57.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@ src/generated
 .classpath
 .project
 .settings/
-settings.gradle
 .gradle/2.1/taskArtifacts
 src/main/resources/namespace-prefix.xjb
 src/main/resource/schemas
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = name
