Update timeout to fetch CATCH to 30s.
Pull in changes to CATCH and SML CMake modules.