diff --git a/.gitignore b/.gitignore
index c3fb9d3ddc8..90f4b9de6c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,14 @@
-*.class
+excludedFiles.txt
+ghidra.repos.config
+
+# Misc files produced while executing application
+repositories/
+Ghidra/.ghidraSvrKeys
+wrapper.log*
+
 Thumbs.db
 .DS_Store
 .svn
-excludedFiles.txt
-.classpath
-.project
-ghidra.repos.config
 
 /*/*/*/*/*/bin/
 /*/*/*/*/*/build/
@@ -21,7 +24,8 @@ ghidra.repos.config
 /bin/
 
 **/dist
-repositories/
+
+# Ignore Sleigh generated files
 *.sla
 **/data/build.xml
 
@@ -30,22 +34,15 @@ repositories/
 *.settings
 *.directory
 .gradle/
-.settings/
 
 # File locks
 *.ulock
 *.lock
 
-# Gradle creates these per developer
-**/vs/
-
-# Misc files produced while executing application
-Ghidra/.ghidraSvrKeys
-wrapper.log*
-
 # Ignore object files
 *.o
 *.obj
+*.class
 
 # Ignore MS Visual Studio artifcats
 Release
@@ -54,6 +51,8 @@ Release
 *.suo
 *.aps
 *.vcproj.*
+*.vcxproj.*
+.vs/
 
 # Ignore UNIX backup files
 *~
@@ -62,3 +61,4 @@ Release
 # Ignore eclipse project files
 .project
 .classpath
+.settings/
diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle
index a9b1d6a6131..0fd371c61bb 100644
--- a/Ghidra/Framework/Generic/build.gradle
+++ b/Ghidra/Framework/Generic/build.gradle
@@ -8,8 +8,8 @@ dependencies {
 	compile "cglib:cglib-nodep:2.2"
 	compile "com.google.guava:guava:19.0"
 	compile "org.jdom:jdom-legacy:1.1.3"
-    compile "org.apache.logging.log4j:log4j-api:2.8.1"
-    compile "org.apache.logging.log4j:log4j-core:2.8.1"
+    compile "org.apache.logging.log4j:log4j-api:2.8.2"
+    compile "org.apache.logging.log4j:log4j-core:2.8.2"
     compile "org.apache.commons:commons-collections4:4.1"
     compile "org.apache.commons:commons-lang3:3.5"
     compile "org.lucee:commons-io:2.6.0"
diff --git a/Ghidra/Framework/Generic/certification.manifest b/Ghidra/Framework/Generic/certification.manifest
index 348cdd700a2..f6b8cb78774 100644
--- a/Ghidra/Framework/Generic/certification.manifest
+++ b/Ghidra/Framework/Generic/certification.manifest
@@ -2,13 +2,13 @@
 ##MODULE IP: Apache License 2.0
 ##MODULE IP: BSD
 ##MODULE IP: Christian Plattner
+##MODULE IP: Crystal Clear Icons - LGPL 2.1
 ##MODULE IP: JDOM License
 ##MODULE IP: MIT
-##MODULE IP: Nuvola Icons - LGPL 2.1
 ##MODULE IP: Modified Nuvola Icons - LGPL 2.1
-##MODULE IP: Tango Icons - Public Domain
+##MODULE IP: Nuvola Icons - LGPL 2.1
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-##MODULE IP: Crystal Clear Icons - LGPL 2.1
+##MODULE IP: Tango Icons - Public Domain
 .classpath||GHIDRA||||END|
 .gitignore||GHIDRA||||END|
 .project||GHIDRA||||END|
diff --git a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle b/GhidraBuild/BuildFiles/JsonDoclet/build.gradle
index f9b749d998f..db5fa4daf40 100644
--- a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle
+++ b/GhidraBuild/BuildFiles/JsonDoclet/build.gradle
@@ -4,5 +4,7 @@ eclipse.project.name = '_JsonDoclet'
 apply plugin: 'java'
 
 dependencies {
-	compile 'com.googlecode.json-simple:json-simple:1.1.1'
+	compile('com.googlecode.json-simple:json-simple:1.1.1') {
+		exclude group: 'junit', module: 'junit'
+	}
 }