Added a cactus object and a pyramid thingy

This added a pyramid and a cactus, and fixed an odd clipping error in
the desert.