Cleaned up the code

Cleaned up a part of the coding
Build against Bukkit-1.4.6-R0.3-Beta
Multiverse updated to v1.2.5