I think it was these guys, Konahonu Divers

Mike Severns offers humpback whale diving.