Switched back to CraftBukkit and let BKCommonLib do Spigot support