Sync the stage simulation with the real turtlebot configuration

Also a fair bit of cleanup.