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

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