Fixed Collision Bug

Collisions in Y direction are now all checked and adjusted first and
then X collisions are done after.  This prevents the hero from slipping
under a block after falling.