WIP - Release 1.0.4

**WIP** Do not merge - Waiting on Jenkins CI

Includes changes required to fix RESET_BETWEEN_SCENARIOS. 

https://github.com/calabash/calabash-ios/issues/518

@krukow I am waiting on Jenkins CI.

I will clear the WIP in the title when I have sorted out a CI code-signing problem.