Start of phase 2 over the overhaul.  Updating now for hlep on bukkit forums.

Signed-off-by: Moose517 <moose51789@gmail.com>