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

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