Upstream merge + remove 3 pulled patches.

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

CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch

@@ -1,4 +1,4 @@
-From 0a8a33e98273e97eed1086de950036935d1cd42a Mon Sep 17 00:00:00 2001
+From c46ce6480300baa0776e9783f66f5dfdd027cadf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
@@ -17,10 +17,10 @@ index 58e5217..f9ac1e1 100644
  
      public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 388acf9..b7b1c45 100644
+index a85fc5b..20b9c5d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -719,6 +719,25 @@ public abstract class PlayerList {
+@@ -720,6 +720,25 @@ public abstract class PlayerList {
              this.sendAll(new Packet201PlayerInfo(entityplayer.getName(), true, entityplayer.ping));
          }
          // CraftBukkit end */