Better collision detection

-Removed some ambiguous code from collision detections with the player
-Fixed an issue that allowed the player to jump through a vertically moving platform