Fixed collision

Reworked collision entirely.  Also build in collision for bumping the
player's head and left-right collision.