Fix some more compile issues in the Forge version
Fix even more compile issues in the Forge version
Forge version: fix more compile issues, add new trees
Remove -SNAPSHOT for upload to BukkitDev
Merge branch master into feature-BioInherit-VirtBiomeId