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

This reverts commit 4c6c7e1ed4f82eb2c90ed7d0b8deaf49ebf0f4a4.
Rebase from 'upstream'
Trimmed the branch to only the scitos_teleop sub directory