Upgrade Calabash to the latest version as of today, 1.0.16.
Small clean ups...