Updated for BukkitForge compat
Updated for BukkitForge #2
Merge branch 'master' of git://github.com/Bukkit/Bukkit