Fixed the collision_detection - somehow the merge changes got
overridden after converting Eigen calls to tf calls. Edited the launch
files to set the robots' ros environment to hydro and not groovy, and
also changed the node and package names. Minor misc changes made in
other places.