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

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