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/0017-Highly-Optimized-Tick-Loop.patch

@@ -1,4 +1,4 @@
-From c6c24ff3f2b9873b4f17444183e5c3eb11516eda Mon Sep 17 00:00:00 2001
+From 04e51665bd1ac94510c2eb76ef995bfb2dd40e05 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 12:28:17 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
@@ -117,7 +117,7 @@ index 0000000..f114a31
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 632f86a..5ebb19a 100644
+index b4656d4..66bf600 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -15,6 +15,7 @@ import org.bukkit.Bukkit;
@@ -128,7 +128,7 @@ index 632f86a..5ebb19a 100644
  
  public class SpigotConfig
  {
-@@ -114,4 +115,9 @@ public class SpigotConfig
+@@ -115,4 +116,9 @@ public class SpigotConfig
      {
          preventProxies = getBoolean( "settings.prevent-proxies", false );
      }