Merged in EnchantView bukkit 2.2.1
Renamed bukkit plugin package
Added necessary imports
Several tweaks