Updated For #1604

Conflict resolution, changes per Tom Spilman and then undo some changes to get further along in the launch path on the simulator. The BasicEffect does not support textures yet from what I can tell when we ran the cocos2d-xna test application against it.