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/0024-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 816df7314c4e568cef2591dfbb22ff3af869c4cb Mon Sep 17 00:00:00 2001
+From 62cef831a76dbfe52e85f86902931b43a6fd50a3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
@@ -142,10 +142,10 @@ index 0000000..a5c4549
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9459195..d8167f2 100644
+index fdab366..32140d1 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -133,4 +133,16 @@ public class SpigotConfig
+@@ -134,4 +134,16 @@ public class SpigotConfig
      {
          commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
      }