Update to laser and world
Merge remote-tracking branch 'origin/Ryan's-branch'