Don't assume all hoppers are blocks. Fixes BUKKIT-3883
Add ability to change player item in hand. Adds BUKKIT-3318
Cleanup comments, formatting, etc
Add methods to check conflicting enchantments. Adds BUKKIT-3830
Merge branch 'master' of https://github.com/Bukkit/CraftBukkit