Merge pull request #42 from DrMarcII/master

Clean up to a lot of WebDriver code.