Upstream merge + remove 3 pulled patches.

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From af02a7e6f7a94b882fc13435e78e9f2eca684060 Mon Sep 17 00:00:00 2001
+From 4563fe77bd20047b474f591af71f2f91ccd9b2b3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index fbdc3c3..34c13e9 100644
+index 4209f2a..37ef0ef 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index fbdc3c3..34c13e9 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.6.2-R0.2-SNAPSHOT</version>
+     <version>1.6.2-R1.1-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>