tests calabash-ios issue 319

to anyone who is watching - i am sorry.  this pull request contains a huge set of changes.