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

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