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

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