Watir merge

This updates to current latest master branch on watir/watir-webdriver.
Potential issues:
1) The monkey patch is in lieu of [doing this](https://github.com/watir/watir-webdriver/blob/master/watir-webdriver.gemspec#L23); we will need to remove it when selenium & watir are officially updated
2)  I'm not sure if there is a reason why we had two .gitmodules for the same watirspec, but I removed the one that doesn't exist in parent repo.