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

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