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

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