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

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