Revamping the entity collision system...

Really should put this back into master asap.