Update imports to wstools in some more places.
Merge pull request #91 from gavanderhoorn/more_rosinstall_wstool_imports

Update imports to wstools in some more places.