Spigot patch update: 0004 (formerly 0003) Merge tweaks and configuration

https://github.com/EcoCityCraft/Spigot/blob/d9c76252eb02f7d0d6bea11efe77e3bb1edb0d99/CraftBukkit-Patches/0004-Merge-tweaks-and-configuration.patch