Increasing timeouts for calabash and removing flaky test
Merge pull request #1 from tomclement/ctumwebaze-master

Increasing timeouts for calabash and removing flaky test