Upstream merge + remove 3 pulled patches.

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

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From f286b76dd6551fc08ca2f1a0a83e3498f2454cd9 Mon Sep 17 00:00:00 2001
+From 798b905a01eca318b3579cd5127edc42cce24c26 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index a46ecbd..0e6c422 100644
+index f23621d..825c821 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index a46ecbd..0e6c422 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.6.2-R0.2-SNAPSHOT</version>
+   <version>1.6.2-R1.1-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>