Update upstream Spigot and upstreamMerge script

Also remove paperclip from upstream merge, it shouldn't need merging very often
2016-03-21 12:32:05 -05:00 · 2016-03-21 12:32:05 -05:00 · 2241a54955
Commit 2241a54955
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 04266858e3436dafcb20eba5ae3c9f6d63a7c5a9
+Subproject commit f04e043eb1aa5cb0c8450cd57d88fdb051cf99fd
--- a/upstreamMerge.sh
+++ b/upstreamMerge.sh
@ -12,5 +12,4 @@ function update {

 update Bukkit
 update CraftBukkit
-update Paperclip
-
+update Spigot