updated to bukkit 1.4.6
Merge remote-tracking branch 'upstream/master'