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

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