starting to mess with collision handling
Merge branch 'master' of https://github.com/allenpark/aquaticevolver
made collision listening general