Updated windows vagrant instructions
Fix collision code with contained entities
Merge branch 'fix-collision'

Fix problem in collision logic.