MCPC+ stealth patch and cleanup

Spigot broke horribly for all Minecraft servers this evening, so there was a rapid fix to it and thus MCPC+. I stealth-patched this in.

The remainder of this update is simple cleanup work.