Collision work
Merge branch 'master' of https://github.com/akbiggs/EmotionIsland
Camera fixup