Merge pull request #1541 from vlidholt/master Adds support for keeping track of contact points in physics