Updates collision detection
Merge branch 'feature/osf' of https://github.com/chrisseto/scrapi into feature/osf