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

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