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

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