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

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