Modified CMakelists to compile with catkin_make instead of catkin_make_isolated