Collision now react to terrain and other entities differently...for the player anyway
Merged master into my branch