Updating per calabash-ios changes
Merge branch 'master' of github.com:ryanwmarsh/motion-calabash