Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers.
Merge branch 'master' of ssh://github.com/highfidelity/hifi into zero-length-penetrations
Fixing indentation.
Fix OS X warning.
Merge pull request #1670 from AndrewMeadows/zero-length-penetrations

Zero length penetrations
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge pull request #1674 from ey6es/master

Fix OS X warning.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Working on sending edits.