Revert "Trimmed the branch to only the segbot_simulator sub directory"

This reverts commit 98b36773c4268e4feda80fb33268358f5891e810.
Rebase from 'upstream'
Trimmed the branch to only the segbot_simulator sub directory