Merge pull request #387 from penguinho/master

Updates for Xcode 6 and new Selenium