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

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