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

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