Unit Collision

Did some internal changes to prep for unit collision
Unit collision 2

Collision dosen't work. Need to do something very different.
Revert "Unit collision 2"

This reverts commit d206bdaef50439699a0a92cb918a055bfb763fd4.
Unit collision 3

Works, but units can move off the map still. Need to look into why dis
is happening. Also, some errors exisit. I mark unit collision as buggy
Merge from John-dev2 to MASTER