Code level clean-up in specs
Don't branch on travis in calabash_exit spec
Merge branch 'develop' of github.com:calabash/calabash-ios into develop