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

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