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

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