Updated scripts to support catkin.