Update stuff to be bukkit compliant… Re-release of 3.1.5