Fix package.foo.nodes not finding nodes for catkin packages

Also apparently kill nodes better (ugh)