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

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