Updates to work with 1.7 bukkit/spigot