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

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