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

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