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

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