Forge version: fix more compile issues, add new trees
Remove -SNAPSHOT for upload to BukkitDev