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

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