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

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