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

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