fixed wood, and cactus

Oak has branches to make it different, cactus has the right minecraft
ID.  Updated to boskee commit 54b182804773bb78ca58d63ebb6552bfb8d56ba1