Move collide sound effect

Attempt to process earlier in function, to minimize delay
Merge branch 'master' into gh-pages