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

This reverts commit 6712af37994a582f4470913b9383c2dc3b4b11b3.
Rebase from 'upstream'
Trimmed the branch to only the scitos_touch sub directory