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

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