Add upstreamMerge.sh and update CB submodule

upstreamMerge.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+PS1="$"
+basedir=`pwd`
+
+function update {
+    cd "$basedir/$1"
+    git fetch && git reset --hard origin/master
+    cd ../
+    git add $1
+}
+
+update Bukkit
+update CraftBukkit
+