Upstream merge + remove 3 pulled patches.

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

CraftBukkit-Patches/0058-Colour-Console-Messages.patch

@@ -0,0 +1,22 @@
+From 33ca90c41ee7904b893c767d1ea6e66f55c83778 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Thu, 4 Jul 2013 10:11:46 +1000
+Subject: [PATCH] Colour Console Messages
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 33eaecc..413e3d8 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -917,7 +917,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+     }
+ 
+     public void sendMessage(ChatMessage chatmessage) {
+-        this.getLogger().info(chatmessage.toString());
++        this.console.sendMessage(chatmessage.toString()); // Spigot - we want coloured and pretty messages too!
+     }
+ 
+     public boolean a(int i, String s) {
+-- 
+1.8.1.2
+