resolves bug where waitUntil cleared implicitWait

includes test
Merge pull request #224 from andyfowler/waituntil-implicit-fix

waitUntil is resetting implicitWait