Upate collisions to be simpler
Merge branch 'ludum-dare' of https://github.com/excaliburjs/Excalibur into ludum-dare