Collision Bug FIxes

Finally figured out what was wrong. Basically the collision detection was only adding a single tile to the tile list for the player and checking around that tile for collisions. In addition to this I was using the same x and y values to mean different things so I made them more consistent. I also fixed the infinite jumping and some sprite changing things. Collision is still buggy but I think that may have to do with all the objects that around a part of the tiled map. I'm going to do more testing on Art's level, but for now these are all good bug fixes.