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

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