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

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