Fix default wait timeout calculation to add extra time correctly
Fix selenium-repeat make command
Merge pull request #314 from Standard8/timeout_calc_fix

Fix intermittent failures due to not waiting long enough for the pending timeout to have time to complete, r=@dmose.  Great find, Mark!