Passing specs in selenium and poltergeist!

Changed BrowserTools in browser-integration file.
Fix merge conflicts