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

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