Changed CMakeLists and package.xml to reflect Groovy/Catkin compiler