Make a few improvements to WrapperStorage
Add missing dispose() calls
Remove BukkitSmerf dependency, make a few code reorderings