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

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