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

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