Fix broken collision code
Merge branch 'master' of https://github.com/mboeh/starfish into devel
Put mboeh in AUTHORS file since I pulled a change from him.