Update timeouts for WebDriverWait to self.timeout

Also PEP8 fixes

My hope is that by changing the timeout the pesky TestExtensions.test_sort_by_region will stop failing intermittently. I wanted to change all timeouts to self.timeout from a hardcoded value of 10 while I was at it.