Update to use catkin_make for building