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

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