#5: use ROS_DISTRO rather than use groovy directly
#5: fix typo and add groovy/catkin