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

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