Upstream and some refactoring

Note: Maybe this doesn't compile, ij is broken af smh, let's give it a try...

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java

@@ -101,6 +101,10 @@ public class BukkitCommandSender extends AbstractNonPlayerActor {
         return WorldEdit.getInstance().getConfiguration().defaultLocale;
     }
 
+    public CommandSender getSender() {
+        return this.sender;
+    }
+
     @Override
     public SessionKey getSessionKey() {
         return new SessionKey() {