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

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