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

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