The server loads all settings correctly as far as I can tell. This marks the end of stage 2. Stage 3 (testing of all features and commands) will start tomorrow.

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0025-Netty.patch

@@ -1,4 +1,4 @@
-From 4656aab62face984022317b27962aa188daa25dd Mon Sep 17 00:00:00 2001
+From ad431c66fd54963754e01d91185c0741474bdfe6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:23:00 +1000
 Subject: [PATCH] Netty
@@ -350,7 +350,7 @@ index 0000000..386c2f8
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index d8167f2..9b74bf0 100644
+index 32140d1..e762527 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,8 @@ import java.io.IOException;
@@ -362,7 +362,7 @@ index d8167f2..9b74bf0 100644
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
-@@ -145,4 +147,44 @@ public class SpigotConfig
+@@ -146,4 +148,44 @@ public class SpigotConfig
          commands.put( "restart", new RestartCommand( "restart" ) );
          WatchdogThread.doStart( timeoutTime, restartOnCrash );
      }