Catkinizing, updating for new rtt_ros