Use selenium instead of selenium_client so firefox driver will work

The old version would not work when running with --driver=firefox. This new version should work on both FirefoxDriver and RemoteWebDriver.

Also, PEP8 fix.