Simplify wait methods

In lieu of rectifying this https://github.com/natritmeyer/site_prism/issues/22 I've made two very subtle simplifications for wait_for_* and wait_for_*_invisible which fix a problem I've been seeing with waiting for a short lived element to disappear.

Tests are green. No additional tests added.