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

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