Updated collisions

Revamped the collisions system based on suggestions by bottomy (https://www.github.com/ScrimpyCat) made in the following post:
http://forums.unixhub.net/showthread.php?tid=900&pid=7852#pid7852

Also took out the redundant overloaded collision function, the collision constants and renamed the direction constants.