pumpkin, melon, tallcactus now generate, torches!

torch now has a block, and pumpkins and melons generate. fixed the
gravel texture error.  tallcactus is a cactus variant.
Merge branch 'master' of https://github.com/ronmurphy/Minecraft

Conflicts:
	resources/textures/texture.png