Add ability to change player item in hand. Adds BUKKIT-3318
Add methods to check for conflicting enchantments. Adds BUKKIT-3830
Merge branch 'master' of https://github.com/Bukkit/Bukkit