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.
Merge pull request #1670 from AndrewMeadows/zero-length-penetrations

Zero length penetrations
resolve conflicts on merge with upstream/master