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

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