removed unnecessary imports
added TimeoutException and removed message parameter in until. A message
is now automatically added to the TimeoutException
updated function calls and method uses for SaladWaiter