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

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