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

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