Add methods to check for conflicting enchantments. Adds BUKKIT-3830
Allow fishing success rate to be adjustable. Adds BUKKIT-3837
Merge branch 'master' of https://github.com/Bukkit/Bukkit into potioneffectchange