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

This reverts commit 9891835dcd1749e5004b9aa0d919e45554b69938.
Rebase from 'upstream'
Trimmed the branch to only the jsk_tools sub directory